Run 4 sample msaa configs for perf on iOS

Also remove seemingly incorrect DM suppression for msaa16 on iOS.

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

infra/bots/recipe_modules/perf/api.py

@@ -27,38 +27,37 @@ def nanobench_flags(bot):
     args.extend(['--skps', 'ignore_skps'])
 
   config = ['8888', 'nonrendering', 'hwui' ]
-  if 'Android' in bot or 'iOS' in bot:
-    config.append('gles')
-  else:
-    config.append('gl')
 
   if '-arm-' not in bot:
     # For Android CPU tests, these take too long and cause the task to time out.
     config += [ 'f16', 'srgb' ]
   if '-GCE-' in bot:
     config += [ '565' ]
-  # The NP produces a long error stream when we run with MSAA.
+
-  if 'NexusPlayer' not in bot:
+  gl_prefix = 'gl'
-    if 'Android' in bot:
+  sample_count = 16
-      # The NVIDIA_Shield has a regular OpenGL implementation. We bench that
+  if 'Android' in bot or 'iOS' in bot:
-      # instead of ES.
+    sample_count = 4
-      if 'NVIDIA_Shield' in bot:
+    # The NVIDIA_Shield has a regular OpenGL implementation. We bench that
-        config.remove('gles')
+    # instead of ES.
-        config.extend(['gl', 'glmsaa4', 'glnvpr4', 'glnvprdit4'])
+    if 'NVIDIA_Shield' not in bot:
-      else:
+      gl_prefix = 'gles'
-        config.extend(['glesmsaa4', 'glesnvpr4', 'glesnvprdit4'])
+    # The NP produces a long error stream when we run with MSAA.
-    else:
+    if 'NexusPlayer' in bot:
-      config.extend(['glmsaa16', 'glnvpr16', 'glnvprdit16'])
+      sample_count = 0
+
+  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)])
 
   # Bench instanced rendering on a limited number of platforms
+  inst_config = gl_prefix + 'inst'
   if 'Nexus6' in bot:
-    config.append('glesinst') # esinst4 isn't working yet on Adreno.
+    config.append(inst_config) # msaa inst isn't working yet on Adreno.
-  elif 'PixelC' in bot:
+  elif 'PixelC' in bot or 'NVIDIA_Shield' in bot or 'MacMini6.2' in bot:
-    config.extend(['glesinst', 'glesinst4'])
+    config.extend([inst_config, inst_config + str(sample_count)])
-  elif 'NVIDIA_Shield' in bot:
-    config.extend(['glinst', 'glinst4'])
-  elif 'MacMini6.2' in bot:
-    config.extend(['glinst', 'glinst16'])
 
   if 'CommandBuffer' in bot:
     config = ['commandbuffer']

infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-GN_Android.json

@@ -434,7 +434,7 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui gles f16 srgb --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~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 --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc",
+      "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui f16 srgb gles --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~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 --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config GN_Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc",
       "[START_DIR]/tmp/nanobench.sh"
     ],
     "name": "write nanobench.sh"

infra/bots/recipe_modules/perf/example.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android.json

@@ -434,7 +434,7 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui gles f16 srgb glesmsaa4 glesnvpr4 glesnvprdit4 glesinst glesinst4 --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 --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android; echo $? >/data/local/tmp/rc",
+      "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui f16 srgb gles glesmsaa4 glesnvpr4 glesnvprdit4 glesinst glesinst4 --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 --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config GN_Android model PixelC os Android; echo $? >/data/local/tmp/rc",
       "[START_DIR]/tmp/nanobench.sh"
     ],
     "name": "write nanobench.sh"

infra/bots/recipe_modules/perf/example.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-GN.json

@@ -115,9 +115,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-GN.json

@@ -120,10 +120,10 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
       "565",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-ANGLE.json

@@ -123,9 +123,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json

@@ -88,9 +88,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json

@@ -88,9 +88,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release.json

@@ -122,9 +122,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug.json

@@ -80,10 +80,10 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
       "565",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release.json

@@ -115,10 +115,10 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
       "565",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE.json

@@ -118,9 +118,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-GTX960-x86_64-Debug-ANGLE.json

@@ -83,9 +83,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot.json

@@ -118,9 +118,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json

@@ -365,7 +365,7 @@
       "[START_DIR]/out/Release/nanobench.app",
       "-I",
       "--args",
-      "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles glmsaa16 glnvpr16 glnvprdit16 --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 --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS"
+      "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --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 --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS"
     ],
     "cwd": "[START_DIR]/skia",
     "env": {

infra/bots/recipe_modules/perf/example.expected/big_issue_number.json

@@ -118,9 +118,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/nobuildbot.json

@@ -146,9 +146,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/perf/example.expected/recipe_with_gerrit_patch.json

@@ -110,9 +110,9 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",

infra/bots/recipe_modules/sktest/api.py

@@ -145,7 +145,6 @@ def dm_flags(bot):
   if 'iOS' in bot:
     blacklist('gles skp _ _')
     blacklist('glesmsaa skp _ _')
-    blacklist('glesmsaa16 gm _ tilemodesProcess')
 
   if 'Mac' in bot or 'iOS' in bot:
     # CG fails on questionable bmps

infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json

@@ -120,10 +120,10 @@
       "8888",
       "nonrendering",
       "hwui",
-      "gl",
       "f16",
       "srgb",
       "565",
+      "gl",
       "glmsaa16",
       "glnvpr16",
       "glnvprdit16",