There was no reason for most of these tests to be marked as
run_concurrent=False. The previous commits fixed a few issues
when enabling concurrency.
Also, move some of the slower-running tests (like streaming-texture-leak)
to the top of the list to start them sooner.
Piglit results with llvmpipe are same before/after this change.
Runtime for the 1.1 tests is about half (1 minute vs. 2 minutes).
---
tests/all.py | 137 +++++++++++++++++++++++++++++------------------------------
1 file changed, 67 insertions(+), 70 deletions(-)
diff --git a/tests/all.py b/tests/all.py
index a0486f1..e58af17 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -899,101 +899,98 @@ with profile.test_list.group_manager(
with profile.test_list.group_manager(
PiglitGLTest,
grouptools.join('spec', '!opengl 1.1')) as g:
- g(['copyteximage', '1D'], run_concurrent=False)
- g(['copyteximage', '2D'], run_concurrent=False)
- g(['drawbuffer-modes'], run_concurrent=False)
- g(['fdo10370'], run_concurrent=False)
- g(['fdo23489'], run_concurrent=False)
- g(['fdo23670-depth_test'], run_concurrent=False)
- g(['fdo23670-drawpix_stencil'], run_concurrent=False)
- g(['r300-readcache'], run_concurrent=False)
- g(['tri-tex-crash'], run_concurrent=False)
- g(['vbo-buffer-unmap'], run_concurrent=False)
- g(['array-stride'], run_concurrent=False)
- g(['clear-accum'], run_concurrent=False)
+ # putting slower tests first
+ g(['streaming-texture-leak'])
+ g(['max-texture-size'])
+ g(['max-texture-size-level'])
+ g(['copyteximage', '1D'])
+ g(['copyteximage', '2D'])
+ g(['drawbuffer-modes'])
+ g(['fdo10370'])
+ g(['fdo23489'])
+ g(['fdo23670-depth_test'])
+ g(['fdo23670-drawpix_stencil'])
+ g(['r300-readcache'])
+ g(['tri-tex-crash'])
+ g(['vbo-buffer-unmap'])
+ g(['array-stride'])
+ g(['clear-accum'])
g(['clipflat'])
- g(['copypixels-draw-sync'], run_concurrent=False)
- g(['copypixels-sync'], run_concurrent=False)
- g(['degenerate-prims'], run_concurrent=False)
- g(['depthfunc'], run_concurrent=False)
- g(['depthrange-clear'], run_concurrent=False)
- g(['dlist-clear'], run_concurrent=False)
- g(['dlist-color-material'], run_concurrent=False)
- g(['dlist-fdo3129-01'], run_concurrent=False)
- g(['dlist-fdo3129-02'], run_concurrent=False)
- g(['dlist-fdo31590'], run_concurrent=False)
- g(['draw-arrays-colormaterial'], run_concurrent=False)
- g(['draw-copypixels-sync'], run_concurrent=False)
+ g(['copypixels-draw-sync'])
+ g(['copypixels-sync'])
+ g(['degenerate-prims'])
+ g(['depthfunc'])
+ g(['depthrange-clear'])
+ g(['dlist-clear'])
+ g(['dlist-color-material'])
+ g(['dlist-fdo3129-01'])
+ g(['dlist-fdo3129-02'])
+ g(['dlist-fdo31590'])
+ g(['draw-arrays-colormaterial'])
+ g(['draw-copypixels-sync'])
g(['draw-pixel-with-texture'])
g(['drawpix-z'])
g(['draw-sync'])
- g(['fog-modes'], run_concurrent=False)
- g(['fragment-center'], run_concurrent=False)
- g(['geterror-invalid-enum'], run_concurrent=False)
- g(['geterror-inside-begin'], run_concurrent=False)
+ g(['fog-modes'])
+ g(['fragment-center'])
+ g(['geterror-invalid-enum'])
+ g(['geterror-inside-begin'])
g(['glinfo'])
g(['gl-1.1-xor'])
g(['gl-1.1-xor-copypixels'])
g(['gl-1.2-texture-base-level'])
g(['gl-1.3-alpha_to_coverage_nop'])
- g(['hiz'], run_concurrent=False)
- g(['infinite-spot-light'], run_concurrent=False)
- g(['line-aa-width'], run_concurrent=False)
+ g(['hiz'])
+ g(['infinite-spot-light'])
+ g(['line-aa-width'])
g(['line-flat-clip-color'])
- g(['lineloop'], run_concurrent=False)
- g(['lineloop', '-dlist'], 'lineloop-dlist', run_concurrent=False)
+ g(['lineloop'])
+ g(['lineloop', '-dlist'], 'lineloop-dlist')
g(['linestipple'], run_concurrent=False)
- g(['longprim'], run_concurrent=False)
+ g(['longprim'])
g(['masked-clear'])
- g(['point-line-no-cull'], run_concurrent=False)
- g(['polygon-mode'], run_concurrent=False)
+ g(['point-line-no-cull'])
+ g(['polygon-mode'])
g(['polygon-mode-facing'])
g(['polygon-mode-offset'])
- g(['polygon-offset'], run_concurrent=False)
+ g(['polygon-offset'])
g(['push-pop-texture-state'])
g(['quad-invariance'])
g(['readpix-z'])
- g(['roundmode-getintegerv'], run_concurrent=False)
- g(['roundmode-pixelstore'], run_concurrent=False)
- g(['select', 'gl11'], 'GL_SELECT - no test function', run_concurrent=False)
- g(['select', 'depth'], 'GL_SELECT - depth-test enabled',
- run_concurrent=False)
- g(['select', 'stencil'], 'GL_SELECT - stencil-test enabled',
- run_concurrent=False)
- g(['select', 'alpha'], 'GL_SELECT - alpha-test enabled',
- run_concurrent=False)
- g(['select', 'scissor'], 'GL_SELECT - scissor-test enabled',
- run_concurrent=False)
- g(['stencil-drawpixels'], run_concurrent=False)
- g(['texgen'], run_concurrent=False)
- g(['two-sided-lighting'], run_concurrent=False)
- g(['user-clip'], run_concurrent=False)
- g(['varray-disabled'], run_concurrent=False)
- g(['windowoverlap'], run_concurrent=False)
- g(['copyteximage-border'], run_concurrent=False)
- g(['copyteximage-clipping'], run_concurrent=False)
- g(['copytexsubimage'], run_concurrent=False)
- g(['getteximage-formats'], run_concurrent=False)
- g(['getteximage-luminance'], run_concurrent=False)
- g(['getteximage-simple'], run_concurrent=False)
- g(['getteximage-depth'], run_concurrent=True)
+ g(['roundmode-getintegerv'])
+ g(['roundmode-pixelstore'])
+ g(['select', 'gl11'], 'GL_SELECT - no test function')
+ g(['select', 'depth'], 'GL_SELECT - depth-test enabled')
+ g(['select', 'stencil'], 'GL_SELECT - stencil-test enabled')
+ g(['select', 'alpha'], 'GL_SELECT - alpha-test enabled')
+ g(['select', 'scissor'], 'GL_SELECT - scissor-test enabled')
+ g(['stencil-drawpixels'])
+ g(['texgen'])
+ g(['two-sided-lighting'])
+ g(['user-clip'])
+ g(['varray-disabled'])
+ g(['windowoverlap'])
+ g(['copyteximage-border'])
+ g(['copyteximage-clipping'])
+ g(['copytexsubimage'])
+ g(['getteximage-formats'])
+ g(['getteximage-luminance'])
+ g(['getteximage-simple'])
+ g(['getteximage-depth'])
g(['incomplete-texture', 'fixed'], 'incomplete-texture-fixed')
- g(['max-texture-size'], run_concurrent=False)
- g(['max-texture-size-level'])
g(['proxy-texture'])
g(['sized-texture-format-channels'])
- g(['streaming-texture-leak'], run_concurrent=False)
- g(['texredefine'], run_concurrent=False)
+ g(['texredefine'])
g(['texsubimage'])
g(['texsubimage-unpack'])
- g(['texsubimage-depth-formats'], run_concurrent=False)
- g(['texture-al'], run_concurrent=False)
+ g(['texsubimage-depth-formats'])
+ g(['texture-al'])
g(['triangle-guardband-viewport'])
g(['getteximage-targets', '1D'])
g(['getteximage-targets', '2D'])
g(['teximage-scale-bias'])
- add_msaa_visual_plain_tests(g, ['draw-pixels'], run_concurrent=False)
- add_msaa_visual_plain_tests(g, ['read-front'], run_concurrent=False)
+ add_msaa_visual_plain_tests(g, ['draw-pixels'])
+ add_msaa_visual_plain_tests(g, ['read-front'])
add_msaa_visual_plain_tests(g, ['read-front', 'clear-front-first'],
run_concurrent=False)
add_texwrap_target_tests(g, '1D')
@@ -1027,7 +1024,7 @@ with profile.test_list.group_manager(
'GL_LUMINANCE12_ALPHA12', 'GL_LUMINANCE16_ALPHA16',
]
for format in color_formats:
- g(['teximage-colors', format], run_concurrent=False)
+ g(['teximage-colors', format])
for num_samples in ['0'] + MSAA_SAMPLE_COUNTS:
add_fbo_depthstencil_tests(g, 'default_fb', num_samples)
--
1.9.1
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
