Start ignoring some GPU expectation tags

Starts ignoring the following sets of tags:
1. android-webview/android-not-webview, as we only use
   android-webview-instrumentation for specifying that an expectation
   applies to Webview.
2. Device-specific GPUs, instead using the device name.

Bug: 1011107, 1111876
Change-Id: Ib110725307d5831de3c5e62665aec6ed867a97a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2477285Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#817761}

content/test/gpu/gpu_tests/gpu_integration_test.py

@@ -547,6 +547,24 @@ class GpuIntegrationTest(
   def GetJSONResultsDelimiter():
     return '/'
 
+  @classmethod
+  def IgnoredTags(cls):
+    return [
+        # We only ever use android-webview-instrumentation if we want to specify
+        # that an expectation applies to Webview.
+        'android-webview',
+        'android-not-webview',
+        # These GPUs are analogous to a particular device, and specifying the
+        # device name is clearer.
+        'arm-mali-t860',  # chromeos-board-kevin
+        'qualcomm-adreno-(tm)-330',  # android-nexus-5
+        'qualcomm-adreno-(tm)-418',  # android-nexus-5x
+        'qualcomm-adreno-(tm)-420',  # android-nexus-6
+        'qualcomm-adreno-(tm)-430',  # android-nexus-6p
+        'qualcomm-adreno-(tm)-540',  # android-pixel-2
+        'nvidia-nvidia-tegra',  # android-nexus-9 and android-shield-android-tv
+    ]
+
 
 def LoadAllTestsInModule(module):
   # Just delegates to serially_executed_browser_test_case to reduce the

content/test/gpu/gpu_tests/test_expectations/context_lost_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 
@@ -84,27 +79,27 @@ crbug.com/923134 [ mac ] ContextLost_WebGL2Blocked [ Skip ]
 crbug.com/923134 [ android ] ContextLost_WebGL2Blocked [ Skip ]
 
 # Flaking on Nexus 5X
-crbug.com/965268 [ android qualcomm-adreno-(tm)-418 ] ContextLost_WebGLBlockedAfterJSNavigation [ Skip ]
-crbug.com/965268 [ android qualcomm-adreno-(tm)-418 ] ContextLost_WebGLUnblockedAfterUserInitiatedReload [ Skip ]
+crbug.com/965268 [ android android-nexus-5x ] ContextLost_WebGLBlockedAfterJSNavigation [ Skip ]
+crbug.com/965268 [ android android-nexus-5x ] ContextLost_WebGLUnblockedAfterUserInitiatedReload [ Skip ]
 crbug.com/880078 [ android ] ContextLost_WorkerRAFAfterGPUCrash [ Failure ]
 crbug.com/880078 [ android ] ContextLost_WorkerRAFAfterGPUCrash_OOPD [ Failure ]
-crbug.com/1064853 [ android qualcomm-adreno-(tm)-418 ] ContextLost_WebGLContextLostFromSelectElement [ Skip ]
+crbug.com/1064853 [ android android-nexus-5x ] ContextLost_WebGLContextLostFromSelectElement [ Skip ]
 
 # Nexus 6
 # The Nexus 6 times out on these tests while waiting for the JS to complete
-crbug.com/611906 [ android qualcomm-adreno-(tm)-420 ] ContextLost_WebGLContextLostFromLoseContextExtension [ Failure ]
-crbug.com/611906 [ android qualcomm-adreno-(tm)-420 ] ContextLost_WebGLContextLostFromQuantity [ Failure ]
-crbug.com/609629 [ android qualcomm-adreno-(tm)-420 ] GpuCrash_GPUProcessCrashesExactlyOncePerVisitToAboutGpuCrash [ Skip ]
-crbug.com/609629 [ android qualcomm-adreno-(tm)-420 ] ContextLost_WebGLContextLostFromGPUProcessExit [ Skip ]
-crbug.com/609629 [ android qualcomm-adreno-(tm)-420 ] ContextLost_WebGLContextLostInHiddenTab [ Skip ]
-crbug.com/609629 [ android qualcomm-adreno-(tm)-420 ] ContextLost_WebGLBlockedAfterJSNavigation [ Skip ]
-crbug.com/609629 [ android qualcomm-adreno-(tm)-420 ] ContextLost_WebGLContextLostFromSelectElement [ Skip ]
-crbug.com/609629 [ android qualcomm-adreno-(tm)-420 ] ContextLost_WebGLUnblockedAfterUserInitiatedReload [ Skip ]
+crbug.com/611906 [ android android-nexus-6 ] ContextLost_WebGLContextLostFromLoseContextExtension [ Failure ]
+crbug.com/611906 [ android android-nexus-6 ] ContextLost_WebGLContextLostFromQuantity [ Failure ]
+crbug.com/609629 [ android android-nexus-6 ] GpuCrash_GPUProcessCrashesExactlyOncePerVisitToAboutGpuCrash [ Skip ]
+crbug.com/609629 [ android android-nexus-6 ] ContextLost_WebGLContextLostFromGPUProcessExit [ Skip ]
+crbug.com/609629 [ android android-nexus-6 ] ContextLost_WebGLContextLostInHiddenTab [ Skip ]
+crbug.com/609629 [ android android-nexus-6 ] ContextLost_WebGLBlockedAfterJSNavigation [ Skip ]
+crbug.com/609629 [ android android-nexus-6 ] ContextLost_WebGLContextLostFromSelectElement [ Skip ]
+crbug.com/609629 [ android android-nexus-6 ] ContextLost_WebGLUnblockedAfterUserInitiatedReload [ Skip ]
 
 # Flaking on Nexus 9
-crbug.com/609629 [ android nvidia ] ContextLost_WebGLBlockedAfterJSNavigation [ Skip ]
-crbug.com/609629 [ android nvidia ] ContextLost_WebGLUnblockedAfterUserInitiatedReload [ Skip ]
-crbug.com/609629 [ android nvidia ] ContextLost_WebGLContextLostFromGPUProcessExit [ Skip ]
+crbug.com/609629 [ android android-nexus-9 ] ContextLost_WebGLBlockedAfterJSNavigation [ Skip ]
+crbug.com/609629 [ android android-nexus-9 ] ContextLost_WebGLUnblockedAfterUserInitiatedReload [ Skip ]
+crbug.com/609629 [ android android-nexus-9 ] ContextLost_WebGLContextLostFromGPUProcessExit [ Skip ]
 
 # Mac NVIDIA only uses the low-power GPU.
 crbug.com/681341 [ mac nvidia ] ContextLost_MacWebGLMultisamplingHighPowerSwitchLosesContext [ Skip ]

content/test/gpu/gpu_tests/test_expectations/depth_capture_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,12 +49,9 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 
-crbug.com/765913 [ android qualcomm-adreno-(tm)-330 ] DepthCapture_depthStreamToR32FloatTexture [ Failure ]
+crbug.com/765913 [ android android-nexus-5 ] DepthCapture_depthStreamToR32FloatTexture [ Failure ]
 
 crbug.com/1080375 [ chromeos chromeos-board-kevin ] DepthCapture_depthStreamToRGBAFloatTexture [ Failure ]

content/test/gpu/gpu_tests/test_expectations/gpu_process_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 

content/test/gpu/gpu_tests/test_expectations/hardware_accelerated_feature_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 

content/test/gpu/gpu_tests/test_expectations/info_collection_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 

content/test/gpu/gpu_tests/test_expectations/maps_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 

content/test/gpu/gpu_tests/test_expectations/power_measurement_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 

content/test/gpu/gpu_tests/test_expectations/screenshot_sync_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 

content/test/gpu/gpu_tests/test_expectations/trace_test_expectations.txt

@@ -7,7 +7,8 @@
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -22,10 +23,7 @@
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -51,9 +49,6 @@
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 # END TAG HEADER
 

content/test/gpu/gpu_tests/test_expectations_unittest.py

@@ -396,10 +396,10 @@ class TestGpuTestExpectationsValidators(unittest.TestCase):
   def testConflictsBetweenAngleAndNonAngleConfigurations(self):
     test_expectations = '''
     # tags: [ android ]
-    # tags: [ qualcomm-adreno-(tm)-418 ]
+    # tags: [ android-nexus-5x ]
     # tags: [ opengles ]
     # results: [ RetryOnFailure Skip ]
-    [ android qualcomm-adreno-(tm)-418 ] a/b/c/d [ RetryOnFailure ]
+    [ android android-nexus-5x ] a/b/c/d [ RetryOnFailure ]
     [ android opengles ] a/b/c/d [ Skip ]
     '''
     errors = CheckTestExpectationPatternsForConflicts(test_expectations,

content/test/gpu/validate_tag_consistency.py

@@ -18,7 +18,8 @@ TAG_HEADER = """\
 #         mac catalina lion highsierra mojave mountainlion sierra
 #         win win7 win8 win10 ]
 # Devices
-# tags: [ android-nexus-5 android-nexus-5x
+# tags: [ android-nexus-5 android-nexus-5x android-nexus-6 android-nexus-6p
+#             android-nexus-9 android-pixel-2 android-shield-android-tv
 #         chromeos-board-amd64-generic chromeos-board-kevin
 #         fuchsia-board-qemu-x64 ]
 # Platform
@@ -33,10 +34,7 @@ TAG_HEADER = """\
 #         apple apple-apple-a12z
 #         intel intel-0xa2e intel-0xd26 intel-0xa011 intel-0x3e92 intel-0x5912
 #         nvidia nvidia-0xfe9 nvidia-0x1cb3 nvidia-0x2184
-#         arm-mali-t860
-#         qualcomm qualcomm-adreno-(tm)-330 qualcomm-adreno-(tm)-418
-#             qualcomm-adreno-(tm)-420 qualcomm-adreno-(tm)-430
-#             qualcomm-adreno-(tm)-540
+#         qualcomm
 #         google-0xffff ]
 # Decoder
 # tags: [ passthrough no-passthrough ]
@@ -62,9 +60,6 @@ TAG_HEADER = """\
 #         mesa_lt_19.1 mesa_ge_20.1 ]
 # ASan
 # tags: [ asan no-asan ]
-# Webview
-# NOTE: Don't actually use these, use android-webview-instrumentation instead.
-# tags: [ android-webview android-not-webview ]
 # results: [ Failure RetryOnFailure Skip ]
 """