framework: update deqp mustpass list for text based mustpass

Submitted by Dylan Baker on April 11, 2018, 4:56 p.m.

Details

Message ID 20180411165610.29879-1-dylan@pnwbakers.com
State New
Headers show
Series "framework: update deqp mustpass list for text based mustpass" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Dylan Baker April 11, 2018, 4:56 p.m.
The current code has bit-rotted quite a bit, in late 2016 the format was
changed from XML based to txt based, but the code was never updated.
---
 framework/test/deqp.py | 22 ++++++----------------
 piglit.conf.example    |  6 +++---
 2 files changed, 9 insertions(+), 19 deletions(-)

Patch hide | download patch | download mbox

diff --git a/framework/test/deqp.py b/framework/test/deqp.py
index 871ce2545..e63ab9368 100644
--- a/framework/test/deqp.py
+++ b/framework/test/deqp.py
@@ -90,23 +90,13 @@  def make_profile(test_list, test_class):
     return profile
 
 
-def gen_mustpass_tests(mp_list):
+def gen_mustpass_tests(mustpass):
     """Return a testlist from the mustpass list."""
-    root = et.parse(mp_list).getroot()
-    group = []
-
-    def gen(base):
-        for elem in base:
-            if elem.tag == 'Test':
-                yield '{}.{}'.format('.'.join(group), elem.get('name'))
-            else:
-                group.append(elem.get('name'))
-                for test in gen(elem):
-                    yield test
-                del group[-1]
-
-    for test in gen(root):
-        yield test
+    with open(mustpass, 'r') as f:
+        for l in f:
+            l = l.strip()
+            if l:
+                yield l
 
 
 def gen_caselist_txt(bin_, caselist, extra_args):
diff --git a/piglit.conf.example b/piglit.conf.example
index d592308b8..5d1ff5474 100644
--- a/piglit.conf.example
+++ b/piglit.conf.example
@@ -60,7 +60,7 @@  testB
 ; Path to the test case list of CTS for deqp-gles2. You can also set this with
 ; the environment variable PIGLIT_DEQP2_MUSTPASS. Piglit will run the subset of
 ; dEQP-GLES2 tests if this option is set.
-;mustpasslist=/home/knuth/src/deqp/android/cts/com.drawelements.deqp.gles2.xml
+;mustpasslist=/home/knuth/src/deqp/android/cts/master/gles2-master.txt
 
 [deqp-gles3]
 ;
@@ -77,7 +77,7 @@  testB
 ; Path to the test case list of CTS for deqp-gles3. You can also set this with
 ; the environment variable PIGLIT_DEQP3_MUSTPASS. Piglit will run the subset of
 ; dEQP-GLES3 tests if this option is set.
-;mustpasslist=/home/knuth/src/deqp/android/cts/com.drawelements.deqp.gles3.xml
+;mustpasslist=/home/knuth/src/deqp/android/cts/master/gles3-master.txt
 
 [deqp-gles31]
 ; Path to the deqp-gles31 executable
@@ -92,7 +92,7 @@  testB
 ; Path to the test case list of CTS for deqp-gles31. You can also set this with
 ; the environment variable PIGLIT_DEQP31_MUSTPASS. Piglit will run the subset of
 ; dEQP-GLES31 tests if this option is set.
-;mustpasslist=/home/knuth/src/deqp/android/cts/com.drawelements.deqp.gles31.xml
+;mustpasslist=/home/knuth/src/deqp/android/cts/master/gles31-master.txt
 
 [deqp-vk]
 ; Path to the deqp-vk executable

Comments

Dylan Baker <dylan@pnwbakers.com> writes:

> The current code has bit-rotted quite a bit, in late 2016 the format was
> changed from XML based to txt based, but the code was never updated.
> ---

I think you can remove the elementtree import now.

Other than that,

Reviewed-by: Eric Anholt <eric@anholt.net>

(though deqp seems much less important to me than VK-GL-CTS, given that
you need to be running from VK-GL-CTS for conformance submissions as far
as I understand)
Quoting Eric Anholt (2018-04-11 12:09:34)
> Dylan Baker <dylan@pnwbakers.com> writes:
> 
> > The current code has bit-rotted quite a bit, in late 2016 the format was
> > changed from XML based to txt based, but the code was never updated.
> > ---
> 
> I think you can remove the elementtree import now.
> 
> Other than that,
> 
> Reviewed-by: Eric Anholt <eric@anholt.net>
> 
> (though deqp seems much less important to me than VK-GL-CTS, given that
> you need to be running from VK-GL-CTS for conformance submissions as far
> as I understand)

Thanks!

This should fix all of the dEQP based suites, including the VK-GL-CTS.

Dylan
Quoting Dylan Baker (2018-04-11 13:39:26)
> Quoting Eric Anholt (2018-04-11 12:09:34)
> > Dylan Baker <dylan@pnwbakers.com> writes:
> > 
> > > The current code has bit-rotted quite a bit, in late 2016 the format was
> > > changed from XML based to txt based, but the code was never updated.
> > > ---
> > 
> > I think you can remove the elementtree import now.
> > 
> > Other than that,
> > 
> > Reviewed-by: Eric Anholt <eric@anholt.net>
> > 
> > (though deqp seems much less important to me than VK-GL-CTS, given that
> > you need to be running from VK-GL-CTS for conformance submissions as far
> > as I understand)
> 
> Thanks!
> 
> This should fix all of the dEQP based suites, including the VK-GL-CTS.

I say that, but actually we'd need to change some code to support mustpass lists
in some of those profiles.

> Dylan
Quoting Dylan Baker (2018-04-11 13:39:26)
> Quoting Eric Anholt (2018-04-11 12:09:34)
> > Dylan Baker <dylan@pnwbakers.com> writes:
> > 
> > > The current code has bit-rotted quite a bit, in late 2016 the format was
> > > changed from XML based to txt based, but the code was never updated.
> > > ---
> > 
> > I think you can remove the elementtree import now.
> > 
> > Other than that,
> > 
> > Reviewed-by: Eric Anholt <eric@anholt.net>
> > 
> > (though deqp seems much less important to me than VK-GL-CTS, given that
> > you need to be running from VK-GL-CTS for conformance submissions as far
> > as I understand)
> 
> Thanks!
> 
> This should fix all of the dEQP based suites, including the VK-GL-CTS.
> 
> Dylan

And I somehow rebased your r-b out of the patch when applying it to master,
but didn't notice until after I pushed. Sigh.

Dylan