graphics_parallel_dEQP: move expectations to files

We want to be able to share the expectations with the VM.

BUG=b:232190712
TEST=graphics_parallel_dEQP.gles2 [  PASSED  ]

Change-Id: I3e640f483135e1e8b68b9f77775bd3b1e1d603d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3641469
Reviewed-by: Emma Anholt <anholt@google.com>
Tested-by: Ilja Friedel <ihf@chromium.org>
Reviewed-by: Po-Hsien Wang <pwang@chromium.org>

8 files changed, 69 insertions, 42 deletions

diff --git a/client/site_tests/graphics_parallel_dEQP/boards/all-chipsets-flakes.txt b/client/site_tests/graphics_parallel_dEQP/boards/all-chipsets-flakes.txt
new file mode 100644
index 0000000000..8327a07003
--- /dev/null
+++ b/client/site_tests/graphics_parallel_dEQP/boards/all-chipsets-flakes.txt
@@ -0,0 +1,3 @@
+# This test flakes across all Mesa drivers (Intel KBL+GLK, AMD, and Qualcomm, at least).
+# https://gitlab.freedesktop.org/mesa/mesa/-/issues/4575
+dEQP-VK.wsi.display.get_display_plane_capabilities
diff --git a/client/site_tests/graphics_parallel_dEQP/boards/all-chipsets-skips.txt b/client/site_tests/graphics_parallel_dEQP/boards/all-chipsets-skips.txt
new file mode 100644
index 0000000000..d0a4d92ddf
--- /dev/null
+++ b/client/site_tests/graphics_parallel_dEQP/boards/all-chipsets-skips.txt
@@ -0,0 +1,18 @@
+# We don't care to run the performance or stress tests from dEQP-GLES on
+# any boards -- they're very slow but don't generally fail.
+dEQP-GLES.*.performance.*
+dEQP-GLES.*.stress.*
+
+# This set of tests may emit warnings, but is not required for
+# conformance and I've never seen anyone pay attention to it.
+dEQP-GLES.*.accuracy.*
+
+# The deqp package ships an Android mustpass list instead of a normal
+# Linux one, which helps us on host check for some extended behavior
+# expectations from Android, but also has some expectations that host
+# dEQP should *not* be trying to enforce (maximum Vulkan version,
+# extensions exposed, layers exposed).  Skip until upstream dEQP can
+# get fixed.  Related: https://gerrit.khronos.org/c/vk-gl-cts/+/5715
+dEQP-VK.api.info.android.no_layers
+dEQP-VK.api.info.android.no_unknown_extensions
+
diff --git a/client/site_tests/graphics_parallel_dEQP/boards/mali-g57-skips.txt b/client/site_tests/graphics_parallel_dEQP/boards/mali-g57-skips.txt
new file mode 100644
index 0000000000..6127dc2b58
--- /dev/null
+++ b/client/site_tests/graphics_parallel_dEQP/boards/mali-g57-skips.txt
@@ -0,0 +1,6 @@
+# The flush_finish tests throw warnings when behavior doesn't match
+# their expectations, except that tiling GPUs don't behave the way they
+# expect in their timing setup so the tests take exceptionally long
+# while just wasting developer time.  Not required to be warnings-free
+# for conformance.
+dEQP-GLES.*.functional.flush_finish.*
diff --git a/client/site_tests/graphics_parallel_dEQP/boards/mali-g72-skips.txt b/client/site_tests/graphics_parallel_dEQP/boards/mali-g72-skips.txt
index 75b02276f2..144db958e7 100644
--- a/client/site_tests/graphics_parallel_dEQP/boards/mali-g72-skips.txt
+++ b/client/site_tests/graphics_parallel_dEQP/boards/mali-g72-skips.txt
@@ -6,3 +6,10 @@ dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail
 # have been removed upstream.
 dEQP-VK.renderpass_with_dynamic_rendering.dedicated_allocation.*
 dEQP-VK.renderpass_with_dynamic_rendering.suballocation.*
+
+# The flush_finish tests throw warnings when behavior doesn't match
+# their expectations, except that tiling GPUs don't behave the way they
+# expect in their timing setup so the tests take exceptionally long
+# while just wasting developer time.  Not required to be warnings-free
+# for conformance.
+dEQP-GLES.*.functional.flush_finish.*
diff --git a/client/site_tests/graphics_parallel_dEQP/boards/mali-t860-skips.txt b/client/site_tests/graphics_parallel_dEQP/boards/mali-t860-skips.txt
new file mode 100644
index 0000000000..6127dc2b58
--- /dev/null
+++ b/client/site_tests/graphics_parallel_dEQP/boards/mali-t860-skips.txt
@@ -0,0 +1,6 @@
+# The flush_finish tests throw warnings when behavior doesn't match
+# their expectations, except that tiling GPUs don't behave the way they
+# expect in their timing setup so the tests take exceptionally long
+# while just wasting developer time.  Not required to be warnings-free
+# for conformance.
+dEQP-GLES.*.functional.flush_finish.*
diff --git a/client/site_tests/graphics_parallel_dEQP/boards/qualcomm-skips.txt b/client/site_tests/graphics_parallel_dEQP/boards/qualcomm-skips.txt
index 6cba30d0ad..e43c64fe00 100644
--- a/client/site_tests/graphics_parallel_dEQP/boards/qualcomm-skips.txt
+++ b/client/site_tests/graphics_parallel_dEQP/boards/qualcomm-skips.txt
@@ -2,3 +2,10 @@
 # have been removed upstream.
 dEQP-VK.renderpass_with_dynamic_rendering.dedicated_allocation.*
 dEQP-VK.renderpass_with_dynamic_rendering.suballocation.*
+
+# The flush_finish tests throw warnings when behavior doesn't match
+# their expectations, except that tiling GPUs don't behave the way they
+# expect in their timing setup so the tests take exceptionally long
+# while just wasting developer time.  Not required to be warnings-free
+# for conformance.
+dEQP-GLES.*.functional.flush_finish.*
diff --git a/client/site_tests/graphics_parallel_dEQP/boards/rogue-skips.txt b/client/site_tests/graphics_parallel_dEQP/boards/rogue-skips.txt
index 8419ccb002..a100b95d9d 100644
--- a/client/site_tests/graphics_parallel_dEQP/boards/rogue-skips.txt
+++ b/client/site_tests/graphics_parallel_dEQP/boards/rogue-skips.txt
@@ -5,3 +5,10 @@ dEQP-GLES31.functional.debug.negative_coverage.*
 # have been removed upstream.
 dEQP-VK.renderpass_with_dynamic_rendering.dedicated_allocation.*
 dEQP-VK.renderpass_with_dynamic_rendering.suballocation.*
+
+# The flush_finish tests throw warnings when behavior doesn't match
+# their expectations, except that tiling GPUs don't behave the way they
+# expect in their timing setup so the tests take exceptionally long
+# while just wasting developer time.  Not required to be warnings-free
+# for conformance.
+dEQP-GLES.*.functional.flush_finish.*
diff --git a/client/site_tests/graphics_parallel_dEQP/graphics_parallel_dEQP.py b/client/site_tests/graphics_parallel_dEQP/graphics_parallel_dEQP.py
index 78d3551c65..6fd361ccbb 100644
--- a/client/site_tests/graphics_parallel_dEQP/graphics_parallel_dEQP.py
+++ b/client/site_tests/graphics_parallel_dEQP/graphics_parallel_dEQP.py
@@ -92,6 +92,12 @@ class graphics_parallel_dEQP(graphics_utils.GraphicsTest):
             logging.debug("No file found at {}".format(expects_path))
             return []
 
+    def read_expectations(self, name):
+        """ """
+        self._skips += self.read_file(name + '-skips.txt')
+        self._fails += self.read_file(name + '-fails.txt')
+        self._flakes += self.read_file(name + '-flakes.txt')
+
     def setup_case_list_filters(self):
         """Set up the skip/flake/fails filter lists.
 
@@ -121,48 +127,15 @@ class graphics_parallel_dEQP(graphics_utils.GraphicsTest):
 
         We could avoid adding filters for other apis than the one being tested,
         but it's harmless to have unused tests in the lists and makes
-        copy-and-paste mistakes less likely.
-
-        We don't care to run the performance or stress tests from dEQP-GLES on
-        any boards -- they're very slow but don't generally fail."""
-
-        self._skips.append('dEQP-GLES.*.performance.*')
-        self._skips.append('dEQP-GLES.*.stress.*')
-
-        # This set of tests may emit warnings, but is not required for
-        # conformance and I've never seen anyone pay attention to it.
-        self._skips.append('dEQP-GLES.*.accuracy.*')
-
-        # The deqp package ships an Android mustpass list instead of a normal
-        # Linux one, which helps us on host check for some extended behavior
-        # expectations from Android, but also has some expectations that host
-        # dEQP should *not* be trying to enforce (maximum Vulkan version,
-        # extensions exposed, layers exposed).  Skip until upstream dEQP can
-        # get fixed.  Related: https://gerrit.khronos.org/c/vk-gl-cts/+/5715
-        self._skips.append('dEQP-VK.api.info.android.no_layers')
-        self._skips.append('dEQP-VK.api.info.android.no_unknown_extensions')
-
-        # The flush_finish tests throw warnings when behavior doesn't match
-        # their expectations, except that tiling GPUs don't behave the way they
-        # expect in their timing setup so the tests take exceptionally long
-        # while just wasting developer time.  Not required to be warnings-free
-        # for conformance.
-        if self._gpu_type in ['qualcomm', 'rogue'
-                              ] or self._gpu_type.startswith('Mali'):
-            self._skips.append('dEQP-GLES.*.functional.flush_finish.*')
-
-        # This test flakes across all Mesa drivers (Intel KBL+GLK, AMD, and Qualcomm, at least).
-        # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4575
-        self._flakes.append(
-                'dEQP-VK.wsi.display.get_display_plane_capabilities')
-
-        # Add any board-specific expectations
-        self._skips += self.read_file(self._board + '-' + 'skips.txt')
-        self._skips += self.read_file(self._gpu_type + '-' + 'skips.txt')
-        self._fails += self.read_file(self._board + '-' + 'fails.txt')
-        self._fails += self.read_file(self._gpu_type + '-' + 'fails.txt')
-        self._flakes += self.read_file(self._board + '-' + 'flakes.txt')
-        self._flakes += self.read_file(self._gpu_type + '-' + 'flakes.txt')
+        copy-and-paste mistakes less likely."""
+        # Add expectations common for all boards/chipsets.
+        self.read_expectations('all-chipsets')
+
+        # Add any chipset specific expectations. Most issues should be here.
+        self.read_expectations(self._gpu_type)
+
+        # Add any board-specific expectations. Lets hope we never need models.
+        self.read_expectations(self._board)
 
     def add_filter_arg(self, command, list, arg, filename):
         """Adds an arg for xfail/skip/flake filtering if we made the file for it."""