| Index: tools/buildbot_spec.json | 
| diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json | 
| index 65e26030b3035c82ea50b4f42aa8fc882dce6ed9..77385e7d896a42a606df57e1d900f9b80b6da857 100644 | 
| --- a/tools/buildbot_spec.json | 
| +++ b/tools/buildbot_spec.json | 
| @@ -2930,6 +2930,186 @@ | 
| "upload_dm_results": true, | 
| "upload_perf_results": false | 
| }, | 
| +  "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SK_USE_DISCARDABLE_SCALEDIMAGECACHE": { | 
| +    "build_targets": [ | 
| +      "dm" | 
| +    ], | 
| +    "builder_cfg": { | 
| +      "arch": "x86_64", | 
| +      "compiler": "GCC", | 
| +      "configuration": "Release", | 
| +      "cpu_or_gpu": "CPU", | 
| +      "cpu_or_gpu_value": "AVX2", | 
| +      "extra_config": "SK_USE_DISCARDABLE_SCALEDIMAGECACHE", | 
| +      "is_trybot": false, | 
| +      "model": "GCE", | 
| +      "os": "Ubuntu", | 
| +      "role": "Test" | 
| +    }, | 
| +    "configuration": "Release", | 
| +    "dm_flags": [ | 
| +      "--matrix", | 
| +      "0", | 
| +      "1", | 
| +      "1", | 
| +      "0", | 
| +      "--config", | 
| +      "565", | 
| +      "8888", | 
| +      "gpu", | 
| +      "upright-matrix-8888", | 
| +      "upright-matrix-gpu", | 
| +      "sp-8888", | 
| +      "msaa16", | 
| +      "pdf", | 
| +      "serialize-8888", | 
| +      "tiles_rt-8888", | 
| +      "pipe-8888", | 
| +      "--src", | 
| +      "tests", | 
| +      "gm", | 
| +      "image", | 
| +      "--blacklist", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "pal8os2v2.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "pal8v4.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "pal8v5.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "rgb16-565.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "rgb16-565pal.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "rgb32-111110.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "rgb32bf.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "rgba32.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "rgba32abf.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "rgb24largepal.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "pal8os2v2-16.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "pal8oversizepal.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "pal4rletrns.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "pal8rletrns.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "4bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "8bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "24bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "32bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "subset", | 
| +      "rgb24largepal.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "subset", | 
| +      "pal8os2v2-16.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "subset", | 
| +      "pal8oversizepal.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "subset", | 
| +      "4bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "subset", | 
| +      "8bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "subset", | 
| +      "24bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "subset", | 
| +      "32bpp-pixeldata-cropped.bmp", | 
| +      "_", | 
| +      "image", | 
| +      "decode", | 
| +      "Hopstarter-Mac-Folders-Apple.ico", | 
| +      "_", | 
| +      "image", | 
| +      "_", | 
| +      "interlaced1.png", | 
| +      "_", | 
| +      "image", | 
| +      "_", | 
| +      "interlaced2.png", | 
| +      "_", | 
| +      "image", | 
| +      "_", | 
| +      "interlaced3.png" | 
| +    ], | 
| +    "do_perf_steps": false, | 
| +    "do_test_steps": true, | 
| +    "env": { | 
| +      "CPPFLAGS": "-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE", | 
| +      "GYP_DEFINES": "skia_arch_type=x86_64 skia_gpu=0 skia_warnings_as_errors=0" | 
| +    }, | 
| +    "nanobench_flags": [ | 
| +      "--scales", | 
| +      "1.0", | 
| +      "1.1", | 
| +      "--config", | 
| +      "565", | 
| +      "8888", | 
| +      "gpu", | 
| +      "nonrendering", | 
| +      "angle", | 
| +      "hwui", | 
| +      "msaa16", | 
| +      "nvprmsaa16" | 
| +    ], | 
| +    "upload_dm_results": true, | 
| +    "upload_perf_results": false | 
| +  }, | 
| "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared": { | 
| "build_targets": [ | 
| "dm" | 
|  |