Switch 16 sample gpu configs to 8 samples

BUG=skia:

Change-Id: I053cce7c05c74860cbace00cd94ea4b96e9a482c
Reviewed-on: https://skia-review.googlesource.com/9889
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Reviewed-by: Ben Wagner <benjaminwagner@google.com>

33 files changed, 118 insertions, 118 deletions

diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py
index 9c91d7a76a..bfa7417a14 100644
--- a/infra/bots/recipe_modules/perf/api.py
+++ b/infra/bots/recipe_modules/perf/api.py
@@ -35,29 +35,29 @@ def nanobench_flags(bot):
     config += [ '565' ]
 
   gl_prefix = 'gl'
-  sample_count = 16
+  sample_count = '8'
   if 'Android' in bot or 'iOS' in bot:
-    sample_count = 4
+    sample_count = '4'
     # The NVIDIA_Shield has a regular OpenGL implementation. We bench that
     # instead of ES.
     if 'NVIDIA_Shield' not in bot:
       gl_prefix = 'gles'
     # The NP produces a long error stream when we run with MSAA.
     if 'NexusPlayer' in bot:
-      sample_count = 0
+      sample_count = ''
 
   config.append(gl_prefix)
-  if sample_count > 0:
-    config.extend([gl_prefix + 'msaa' + str(sample_count),
-      gl_prefix + 'nvpr' + str(sample_count),
-      gl_prefix + 'nvprdit' + str(sample_count)])
+  if sample_count is not '':
+    config.extend([gl_prefix + 'msaa' + sample_count,
+      gl_prefix + 'nvpr' + sample_count,
+      gl_prefix + 'nvprdit' + sample_count])
 
   # Bench instanced rendering on a limited number of platforms
   inst_config = gl_prefix + 'inst'
   if 'Nexus6' in bot:
     config.append(inst_config) # msaa inst isn't working yet on Adreno.
   elif 'PixelC' in bot or 'NVIDIA_Shield' in bot or 'MacMini6.2' in bot:
-    config.extend([inst_config, inst_config + str(sample_count)])
+    config.extend([inst_config, inst_config + sample_count])
 
   if 'CommandBuffer' in bot:
     config = ['commandbuffer']
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json
index 325631c451..55b489db35 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json
@@ -118,11 +118,11 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "glinst",
-      "glinst16",
+      "glinst8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
index 161278d99a..94f42dab80 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json
@@ -124,9 +124,9 @@
       "srgb",
       "565",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
index ba2b1482ca..7f315f25d0 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json
@@ -126,9 +126,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "angle_d3d11_es2",
       "angle_gl_es2",
       "--match",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index 2e9f520a1a..a07a8ecb45 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -91,9 +91,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--loops",
       "1",
       "--samples",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
index 3f5371f4d2..08812d3086 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
@@ -91,9 +91,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--loops",
       "1",
       "--samples",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
index b60c599778..1abd2a02d8 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json
@@ -125,9 +125,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json
index 53e69a408a..05740bf6ac 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -84,9 +84,9 @@
       "srgb",
       "565",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json
index fc07fa57d5..b905f5ee82 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json
@@ -119,9 +119,9 @@
       "srgb",
       "565",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json
index 1b3ae70793..4842f27dc1 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json
@@ -121,9 +121,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "angle_d3d11_es2",
       "--match",
       "~tile_image_filter_tiled_64",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
index edd728a365..b667fed4dc 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -86,9 +86,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "angle_d3d11_es2",
       "--match",
       "~inc0.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
index 4cce4e96ab..e92036ba98 100644
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json
@@ -121,9 +121,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json
index ea034ccccd..e9e211c78b 100644
--- a/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json
+++ b/infra/bots/recipe_modules/perf/example.expected/big_issue_number.json
@@ -121,9 +121,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json
index e7b646d1bf..39f7aa8819 100644
--- a/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json
+++ b/infra/bots/recipe_modules/perf/example.expected/nobuildbot.json
@@ -149,9 +149,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--match",
       "~inc0.gif",
       "~inc1.gif",
diff --git a/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json
index 77a10bc67a..919d72a250 100644
--- a/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json
@@ -113,9 +113,9 @@
       "f16",
       "srgb",
       "gl",
-      "glmsaa16",
-      "glnvpr16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvpr8",
+      "glnvprdit8",
       "--loops",
       "1",
       "--samples",
diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index f1d2042eac..e6a11a8440 100644
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -27,10 +27,17 @@ def dm_flags(bot):
   # may opt out or substitute some below for specific bots
   configs = ['8888', 'srgb', 'pdf']
   # Add in either gles or gl configs to the canonical set based on OS
+  sample_count = '8'
+  gl_prefix = 'gl'
   if 'Android' in bot or 'iOS' in bot:
-    configs.extend(['gles', 'glesdft', 'glessrgb', 'glesmsaa4'])
-  else:
-    configs.extend(['gl', 'gldft', 'glsrgb', 'glmsaa16'])
+    sample_count = '4'
+    # We want to test the OpenGL config not the GLES config on the Shield
+    if 'NVIDIA_Shield' not in bot:
+      gl_prefix = 'gles'
+
+  configs.extend([gl_prefix, gl_prefix + 'dft', gl_prefix + 'srgb',
+                  gl_prefix + 'msaa' + sample_count])
+
 
   # The NP produces a long error stream when we run with MSAA. The Tegra3 just
   # doesn't support it.
@@ -64,14 +71,7 @@ def dm_flags(bot):
         'GTX550Ti' in bot or
         'GTX660'   in bot or
         'GT610'    in bot):
-      if 'Android' in bot:
-        configs.append('glesnvprdit4')
-      else:
-        configs.append('glnvprdit16')
-
-  # We want to test the OpenGL config not the GLES config on the Shield
-  if 'NVIDIA_Shield' in bot:
-    configs = [x.replace('gles', 'gl') for x in configs]
+      configs.append(gl_prefix + 'nvprdit' + sample_count)
 
   # NP is running out of RAM when we run all these modes.  skia:3255
   if 'NexusPlayer' not in bot:
@@ -80,17 +80,17 @@ def dm_flags(bot):
 
   # Test instanced rendering on a limited number of platforms
   if 'Nexus6' in bot:
-    configs.append('glesinst') # glesinst4 isn't working yet on Adreno.
-  elif 'NVIDIA_Shield' in bot:
-    # Multisampled instanced configs use nvpr.
-    configs = [x.replace('glnvpr', 'glinst') for x in configs]
-    configs.append('glinst')
-  elif 'PixelC' in bot:
-    # Multisampled instanced configs use nvpr.
-    configs = [x.replace('glesnvpr', 'glesinst') for x in configs]
-    configs.append('glesinst')
+    configs.append(gl_prefix + 'inst') # inst msaa isn't working yet on Adreno.
+  elif 'NVIDIA_Shield' in bot or 'PixelC' in bot:
+    # Multisampled instanced configs use nvpr so we substitute inst msaa
+    # configs for nvpr msaa configs.
+    old = gl_prefix + 'nvpr'
+    new = gl_prefix + 'inst'
+    configs = [x.replace(old, new) for x in configs]
+    # We also test non-msaa instanced.
+    configs.append(new)
   elif 'MacMini6.2' in bot:
-    configs.extend(['glinst', 'glinst16'])
+    configs.extend([gl_prefix + 'inst', gl_prefix + 'inst' + sample_count])
 
   # CommandBuffer bot *only* runs the command_buffer config.
   if 'CommandBuffer' in bot:
@@ -124,8 +124,7 @@ def dm_flags(bot):
 
   # TODO: ???
   blacklist('f16 _ _ dstreadshuffle')
-  blacklist('glessrgb image _ _')
-  blacklist('glsrgb image _ _')
+  blacklist(gl_prefix + 'srgb image _ _')
 
   # Decoder tests are now performing gamma correct decodes.  This means
   # that, when viewing the results, we need to perform a gamma correct
@@ -147,8 +146,7 @@ def dm_flags(bot):
     blacklist('_ svg _ _')
 
   if 'iOS' in bot:
-    blacklist('gles skp _ _')
-    blacklist('glesmsaa skp _ _')
+    blacklist(gl_prefix + ' skp _ _')
 
   if 'Mac' in bot or 'iOS' in bot:
     # CG fails on questionable bmps
@@ -311,34 +309,36 @@ def dm_flags(bot):
   # Large image that overwhelms older Mac bots
   if 'MacMini4.1-GPU' in bot:
     blacklist('_ image _ abnormal.wbmp')
-    blacklist(['glmsaa16', 'gm', '_', 'blurcircles'])
+    blacklist([gl_prefix + 'msaa' + sample_count, 'gm', '_', 'blurcircles'])
 
   if 'IntelHD405' in bot and 'Ubuntu16' in bot:
     # skia:6331
-    blacklist('glmsaa16 image gen_codec_gpu abnormal.wbmp')
+    blacklist(gl_prefix + 'msaa' + sample_count +
+        ' image gen_codec_gpu abnormal.wbmp')
 
   if 'Nexus5' in bot:
     # skia:5876
     blacklist(['_', 'gm', '_', 'encode-platform'])
 
   if 'AndroidOne-GPU' in bot:  # skia:4697, skia:4704, skia:4694, skia:4705
-    blacklist(['_',         'gm', '_', 'bigblurs'])
-    blacklist(['_',         'gm', '_', 'bleed'])
-    blacklist(['_',         'gm', '_', 'bleed_alpha_bmp'])
-    blacklist(['_',         'gm', '_', 'bleed_alpha_bmp_shader'])
-    blacklist(['_',         'gm', '_', 'bleed_alpha_image'])
-    blacklist(['_',         'gm', '_', 'bleed_alpha_image_shader'])
-    blacklist(['_',         'gm', '_', 'bleed_image'])
-    blacklist(['_',         'gm', '_', 'dropshadowimagefilter'])
-    blacklist(['_',         'gm', '_', 'filterfastbounds'])
-    blacklist(['gles',      'gm', '_', 'imageblurtiled'])
-    blacklist(['glesmsaa4', 'gm', '_', 'imageblurtiled'])
-    blacklist(['glesmsaa4', 'gm', '_', 'imagefiltersbase'])
-    blacklist(['_',         'gm', '_', 'imagefiltersclipped'])
-    blacklist(['_',         'gm', '_', 'imagefiltersscaled'])
-    blacklist(['_',         'gm', '_', 'imageresizetiled'])
-    blacklist(['_',         'gm', '_', 'matrixconvolution'])
-    blacklist(['_',         'gm', '_', 'strokedlines'])
+    gl_msaa_config = gl_prefix + 'msaa' + sample_count
+    blacklist(['_',            'gm', '_', 'bigblurs'])
+    blacklist(['_',            'gm', '_', 'bleed'])
+    blacklist(['_',            'gm', '_', 'bleed_alpha_bmp'])
+    blacklist(['_',            'gm', '_', 'bleed_alpha_bmp_shader'])
+    blacklist(['_',            'gm', '_', 'bleed_alpha_image'])
+    blacklist(['_',            'gm', '_', 'bleed_alpha_image_shader'])
+    blacklist(['_',            'gm', '_', 'bleed_image'])
+    blacklist(['_',            'gm', '_', 'dropshadowimagefilter'])
+    blacklist(['_',            'gm', '_', 'filterfastbounds'])
+    blacklist([gl_prefix,      'gm', '_', 'imageblurtiled'])
+    blacklist([gl_msaa_config, 'gm', '_', 'imageblurtiled'])
+    blacklist([gl_msaa_config, 'gm', '_', 'imagefiltersbase'])
+    blacklist(['_',            'gm', '_', 'imagefiltersclipped'])
+    blacklist(['_',            'gm', '_', 'imagefiltersscaled'])
+    blacklist(['_',            'gm', '_', 'imageresizetiled'])
+    blacklist(['_',            'gm', '_', 'matrixconvolution'])
+    blacklist(['_',            'gm', '_', 'strokedlines'])
 
   match = []
   if 'Valgrind' in bot: # skia:3021
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
index d3f1fbba8c..ff21533375 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Debug.json
@@ -215,7 +215,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -602,7 +602,7 @@
       "image",
       "_",
       "abnormal.wbmp",
-      "glmsaa16",
+      "glmsaa8",
       "gm",
       "_",
       "blurcircles"
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
index fd9891aeff..0f88ea0231 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
@@ -215,12 +215,12 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
       "glinst",
-      "glinst16",
+      "glinst8",
       "--src",
       "tests",
       "gm",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
index d9005c8e4c..6671eb8a80 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json
@@ -223,7 +223,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
index e4b68732ea..8b60270a5d 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-ASAN.json
@@ -113,7 +113,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
index 8080bb965f..03e5b8e4d7 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN.json
@@ -113,7 +113,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
index b805eeaec1..390f12902b 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
@@ -221,7 +221,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
index fd2686c33b..14eae10649 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared.json
@@ -223,7 +223,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
index 73b9c9378b..d3ae9549ff 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN.json
@@ -113,7 +113,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
index e8858d68af..17a3dc56fc 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
@@ -116,8 +116,8 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvprdit8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
index 8dd10980c0..5319205fdb 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json
@@ -116,8 +116,8 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvprdit8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json
index 3633fca5a3..9ae28a90fe 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json
@@ -116,8 +116,8 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
-      "glnvprdit16",
+      "glmsaa8",
+      "glnvprdit8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
index 811550edc3..312aa52e96 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json
@@ -220,7 +220,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
@@ -519,7 +519,7 @@
       "image",
       "_",
       ".SRW",
-      "glmsaa16",
+      "glmsaa8",
       "image",
       "gen_codec_gpu",
       "abnormal.wbmp"
diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
index 03f38d7e4f..eceda83edb 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot.json
@@ -221,7 +221,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
index 2df7fd2332..d0dd0e0b11 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/big_issue_number.json
@@ -221,7 +221,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "serialize-8888",
       "tiles_rt-8888",
       "pic-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
index 6b909c1ff4..9b43c7960e 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/failed_dm.json
@@ -221,7 +221,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
index d9cc26b7f6..71a38fcab0 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/nobuildbot.json
@@ -261,7 +261,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",
diff --git a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
index 441f5a98e2..a271294cbf 100644
--- a/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/recipe_with_gerrit_patch.json
@@ -227,7 +227,7 @@
       "gl",
       "gldft",
       "glsrgb",
-      "glmsaa16",
+      "glmsaa8",
       "565",
       "f16",
       "sp-8888",