ci/etnaviv: Get the gc2000_piglit manual job mostly working.

It was timing out, and the xfails were rather stale.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22039>

diff --git a/src/etnaviv/ci/etnaviv-gc2000-fails.txt b/src/etnaviv/ci/etnaviv-gc2000-fails.txt
index 195a4a4..9576993 100644 (file)
--- a/src/etnaviv/ci/etnaviv-gc2000-fails.txt
+++ b/src/etnaviv/ci/etnaviv-gc2000-fails.txt
@@ -299,11 +299,14 @@ dEQP-GLES2.functional.uniform_api.random.0,Fail
 fast_color_clear@fcc-read-after-clear blit tex,Fail
 fast_color_clear@fcc-read-after-clear copy rb,Fail
 fast_color_clear@fcc-read-after-clear copy tex,Fail
+
+hiz@hiz-stencil-test-fbo-d0-s8,Fail
+
 shaders@glsl-bug-110796,Fail
 shaders@glsl-fs-flat-color,Fail
 shaders@glsl-fs-loop-nested,Crash
 shaders@glsl-fs-pointcoord,Fail
-shaders@glsl-kwin-blur-1,Fail
+shaders@glsl-kwin-blur-1,Crash
 shaders@glsl-kwin-blur-2,Fail
 shaders@glsl-max-varyings,Crash
 shaders@glsl-max-varyings >max_varying_components,Crash
@@ -314,6 +317,7 @@ shaders@glsl-uniform-interstage-limits@subdivide 5,Timeout
 shaders@glsl-vs-loop-nested,Crash
 shaders@glsl-vs-point-size,Fail
 spec@arb_arrays_of_arrays@execution@glsl-arrays-copy-size-mismatch,Fail
+spec@arb_depth_texture@fbo-depth-gl_depth_component16-drawpixels,Fail
 spec@arb_depth_texture@fbo-depth-gl_depth_component16-tex1d,Fail
 spec@arb_depth_texture@fbo-depth-gl_depth_component24-blit,Fail
 spec@arb_depth_texture@texwrap formats bordercolor,Fail
@@ -332,7 +336,6 @@ spec@arb_es2_compatibility@texwrap formats bordercolor-swizzled@GL_RGB565- swizz
 spec@arb_fragment_program@fp-fragment-position,Crash
 spec@arb_fragment_program@fp-indirections2,Fail
 spec@arb_fragment_program@sparse-samplers,Crash
-spec@arb_framebuffer_object@arb_framebuffer_object-depth-stencil-blit depth_stencil gl_depth24_stencil8,Fail
 spec@arb_framebuffer_object@arb_framebuffer_object-depth-stencil-blit stencil gl_depth24_stencil8,Fail
 spec@arb_framebuffer_object@arb_framebuffer_object-depth-stencil-blit stencil gl_stencil_index16,Fail
 spec@arb_framebuffer_object@arb_framebuffer_object-depth-stencil-blit stencil gl_stencil_index1,Fail
@@ -341,17 +344,20 @@ spec@arb_framebuffer_object@arb_framebuffer_object-depth-stencil-blit stencil gl
 spec@arb_framebuffer_object@fbo-alpha,Crash
 spec@arb_framebuffer_object@fbo-attachments-blit-scaled-linear,Crash
 spec@arb_framebuffer_object@fbo-blit-stretch,Fail
-spec@arb_framebuffer_object@fbo-generatemipmap-3d,Crash
+
 spec@arb_framebuffer_object@fbo-generatemipmap-cubemap s3tc_dxt1,Crash
+
 spec@arb_framebuffer_object@fbo-gl_pointcoord,Fail
-spec@arb_framebuffer_object@fbo-incomplete,Crash
+
 spec@arb_framebuffer_object@framebuffer-blit-levels draw stencil,Fail
 spec@arb_framebuffer_object@framebuffer-blit-levels read stencil,Fail
 spec@arb_framebuffer_object@same-attachment-glframebuffertexture2d-gl_depth_stencil_attachment,Fail
+spec@arb_framebuffer_object@same-attachment-tex2d-depth_stencil,Fail
+
 spec@arb_internalformat_query2@all internalformat_<x>_type pname checks,Timeout
 spec@arb_internalformat_query2@max dimensions related pname checks,Fail
 spec@arb_internalformat_query2@max dimensions related pname checks@GL_MAX_LAYERS,Fail
-spec@arb_map_buffer_alignment@arb_map_buffer_alignment-sanity_test,Fail
+
 spec@arb_occlusion_query2@render,Fail
 spec@arb_occlusion_query@occlusion_query_conform,Fail
 spec@arb_occlusion_query@occlusion_query_conform@GetObjivAval_multi1,Fail
@@ -366,43 +372,42 @@ spec@arb_point_sprite@arb_point_sprite-interactions 1.0,Fail
 spec@arb_point_sprite@arb_point_sprite-mipmap,Fail
 spec@arb_provoking_vertex@arb-provoking-vertex-clipped-geometry-flatshading,Fail
 spec@arb_provoking_vertex@arb-provoking-vertex-render,Fail
-spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgrad,Crash
-spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Crash
-spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-01,Crash
-spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-04,Crash
-spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-07,Crash
-spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-cumulative,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 1d,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 1dshadow,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2d,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2drect,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2drectshadow,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2dshadow,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 3d,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb cube,Crash
+spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgrad,Fail
+spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgradcube,Fail
+spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-07,Fail
+spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-08,Fail
+spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-cumulative,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 1d,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 1dshadow,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2d,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2drect,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2drectshadow,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 2dshadow,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb 3d,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *gradarb cube,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 1d,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 1dshadow,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 2d,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 2dshadow,Fail
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 3d,Crash
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod 3d,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *lod cube,Fail
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1d,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1d_projvec4,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1dshadow,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2d,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2d_projvec4,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drect,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drect_projvec4,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drectshadow,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2dshadow,Crash
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 3d,Crash
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1d,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1d_projvec4,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 1dshadow,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2d,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2d_projvec4,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drect,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drect_projvec4,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2drectshadow,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 2dshadow,Fail
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projgradarb 3d,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 1d,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 1d_projvec4,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 1dshadow,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 2d,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 2d_projvec4,Fail
 spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 2dshadow,Fail
-spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 3d,Crash
+spec@arb_shader_texture_lod@execution@tex-miplevel-selection *projlod 3d,Fail
 spec@arb_texture_compression@texwrap formats bordercolor,Fail
 spec@arb_texture_compression@texwrap formats bordercolor@GL_COMPRESSED_ALPHA- border color only,Fail
 spec@arb_texture_compression@texwrap formats bordercolor@GL_COMPRESSED_INTENSITY- border color only,Fail
@@ -417,17 +422,30 @@ spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_
 spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_LUMINANCE- swizzled- border color only,Fail
 spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGBA- swizzled- border color only,Fail
 spec@arb_texture_compression@texwrap formats bordercolor-swizzled@GL_COMPRESSED_RGB- swizzled- border color only,Fail
+
+spec@ati_texture_compression_3dc@texwrap formats bordercolor,Fail
+spec@ati_texture_compression_3dc@texwrap formats bordercolor-swizzled,Fail
+spec@ati_texture_compression_3dc@texwrap formats bordercolor-swizzled@GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI- swizzled- border color only,Fail
+spec@ati_texture_compression_3dc@texwrap formats bordercolor@GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI- border color only,Fail
+
 spec@arb_texture_cube_map@cubemap npot,Fail
+
+spec@arb_texture_rectangle@copyteximage rect,Fail
+spec@arb_texture_rectangle@fbo-blit rect,Fail
 spec@arb_texture_rectangle@glsl-fs-shadow2drect-07,Fail
 spec@arb_texture_rectangle@texwrap rect bordercolor,Fail
 spec@arb_texture_rectangle@texwrap rect bordercolor@GL_RGBA8- border color only,Fail
 spec@arb_texture_rectangle@texwrap rect proj bordercolor,Fail
 spec@arb_texture_rectangle@texwrap rect proj bordercolor@GL_RGBA8- projected- border color only,Fail
+
 spec@arb_texture_storage@texture-storage@2D mipmap rendering ,Fail
 spec@arb_texture_storage@texture-storage,Fail
 spec@arb_vertex_buffer_object@pos-array,Fail
 spec@arb_vertex_program@big-param,Fail
 spec@arb_vertex_program@clip-plane-transformation arb,Fail
+spec@arb_vertex_program@vp-arl-constant-array-huge-offset,Fail
+spec@arb_vertex_program@vp-arl-constant-array-varying,Fail
+
 spec@egl 1.4@eglterminate then unbind context,Fail
 spec@egl_ext_protected_content@conformance,Fail
 spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail
@@ -460,7 +478,7 @@ spec@ext_framebuffer_multisample@accuracy all_samples stencil_draw depthstencil,
 spec@ext_framebuffer_multisample@accuracy all_samples stencil_draw small depthstencil,Fail
 spec@ext_framebuffer_multisample@accuracy all_samples stencil_resolve depthstencil,Fail
 spec@ext_framebuffer_multisample@accuracy all_samples stencil_resolve small depthstencil,Fail
-spec@ext_framebuffer_object@fbo-3d,Crash
+
 spec@ext_framebuffer_object@fbo-alphatest-formats,Crash
 spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail
 spec@ext_framebuffer_object@fbo-blending-formats,Crash
@@ -490,7 +508,6 @@ spec@ext_packed_depth_stencil@fbo-clear-formats stencil,Fail
 spec@ext_packed_depth_stencil@fbo-clear-formats stencil@GL_DEPTH24_STENCIL8,Fail
 spec@ext_packed_depth_stencil@fbo-clear-formats stencil@GL_DEPTH_STENCIL,Fail
 spec@ext_packed_depth_stencil@fbo-depth-gl_depth24_stencil8-copypixels,Fail
-spec@ext_packed_depth_stencil@fbo-depthstencil-gl_depth24_stencil8-clear,Fail
 spec@ext_packed_depth_stencil@fbo-stencil-gl_depth24_stencil8-blit,Fail
 spec@ext_packed_depth_stencil@texwrap formats bordercolor,Fail
 spec@ext_packed_depth_stencil@texwrap formats bordercolor@GL_DEPTH24_STENCIL8- border color only,Fail
@@ -510,7 +527,9 @@ spec@ext_texture_array@glsl-fs-shadow2darray-07,Fail
 spec@ext_texture_array@maxlayers,Fail
 spec@ext_texture_array@render-1darray,Fail
 spec@ext_texture_array@texsubimage array,Fail
-spec@ext_texture_compression_s3tc@s3tc-targeted,Fail
+
+spec@ext_texture_compression_s3tc@getteximage-targets 2d s3tc,Fail
+spec@ext_texture_compression_s3tc@s3tc-teximage,Fail
 spec@ext_texture_compression_s3tc@texwrap formats bordercolor,Fail
 spec@ext_texture_compression_s3tc@texwrap formats bordercolor@GL_COMPRESSED_RGBA_S3TC_DXT1_EXT- border color only,Fail
 spec@ext_texture_compression_s3tc@texwrap formats bordercolor@GL_COMPRESSED_RGBA_S3TC_DXT3_EXT- border color only,Fail
@@ -664,12 +683,7 @@ spec@glsl-1.20@execution@fs-nan-builtin-max,Fail
 spec@glsl-1.20@execution@fs-nan-builtin-min,Fail
 spec@glsl-1.20@execution@fs-vec4-const-array-indirect-access-256-elements,Fail
 spec@glsl-1.20@execution@out-parameter-indexing@fs-inout-index-two-level,Fail
-spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() 3d,Crash
-spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 3d,Crash
-spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) cube,Fail
-spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture() cube,Fail
-spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Crash
-spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 3d,Crash
+spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 3d,Fail
 spec@glsl-1.20@execution@variable-indexing@fs-varying-array-mat4-index-col-rd,Fail
 spec@glsl-1.20@execution@variable-indexing@fs-varying-array-mat4-index-col-row-rd,Fail
 spec@glsl-1.20@execution@variable-indexing@vs-varying-array-mat4-index-col-rd,Fail
@@ -692,12 +706,8 @@ spec@khr_texture_compression_astc@miptree-gl srgb-fp@sRGB decode full precision,
 spec@nv_copy_image@nv_copy_image-simple --tex-to-tex,Fail
 spec@nv_primitive_restart@primitive-restart-draw-mode-lines,Fail
 spec@nv_primitive_restart@primitive-restart-draw-mode-triangles,Fail
-spec@!opengl 1.0@depth-clear-precision-check@depth24,Fail
-spec@!opengl 1.0@depth-clear-precision-check@depth24_stencil8,Fail
-spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail
-spec@!opengl 1.0@depth-clear-precision-check,Fail
 spec@!opengl 1.0@gl-1.0-blend-func,Fail
-spec@!opengl 1.0@gl-1.0-dlist-bitmap,Crash
+
 spec@!opengl 1.0@gl-1.0-dlist-materials,Fail
 spec@!opengl 1.0@gl-1.0-dlist-shademodel,Fail
 spec@!opengl 1.0@gl-1.0-drawbuffer-modes,Fail
@@ -2023,8 +2033,8 @@ spec@!opengl 1.1@clipflat@glDrawElements(GL_TRIANGLE_STRIP)- glFrontFace(GL_CW)-
 spec@!opengl 1.1@clipflat@glDrawElements(GL_TRIANGLE_STRIP)- glFrontFace(GL_CW)- glPolygonMode(GL_LINE)- quadrant: right middle PV: LAST,Fail
 spec@!opengl 1.1@clipflat@glDrawElements(GL_TRIANGLE_STRIP)- glFrontFace(GL_CW)- glPolygonMode(GL_LINE)- quadrant: right top PV: FIRST,Fail
 spec@!opengl 1.1@clipflat@glDrawElements(GL_TRIANGLE_STRIP)- glFrontFace(GL_CW)- glPolygonMode(GL_LINE)- quadrant: right top PV: LAST,Fail
-spec@!opengl 1.1@depthstencil-default_fb-clear,Fail
 spec@!opengl 1.1@depthstencil-default_fb-copypixels,Fail
+spec@!opengl 1.1@fog-modes,Fail
 spec@!opengl 1.1@getteximage-luminance,Crash
 spec@!opengl 1.1@gl-1.1-xor-copypixels,Fail
 spec@!opengl 1.1@gl-1.1-xor,Fail
@@ -2035,6 +2045,8 @@ spec@!opengl 1.1@linestipple,Fail
 spec@!opengl 1.1@linestipple@Line loop,Fail
 spec@!opengl 1.1@linestipple@Line strip,Fail
 spec@!opengl 1.1@linestipple@Restarting lines within a single Begin-End block,Fail
+spec@!opengl 1.1@line-smooth-coverage,Fail
+spec@!opengl 1.1@line-smooth-stipple,Fail
 spec@!opengl 1.1@polygon-mode,Fail
 spec@!opengl 1.1@polygon-mode-offset@config 0: Expected blue pixel in center,Fail
 spec@!opengl 1.1@polygon-mode-offset@config 0: Expected white pixel on right edge,Fail
@@ -2138,7 +2150,7 @@ spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA4- swizzled- border
 spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGBA8- swizzled- border color only,Fail
 spec@!opengl 1.1@two-sided-lighting,Fail
 spec@!opengl 1.1@user-clip,Fail
-spec@!opengl 1.2@copyteximage 3d,Crash
+spec@!opengl 1.2@copyteximage 3d,Fail
 spec@!opengl 1.2@lodclamp-between-max,Fail
 spec@!opengl 1.2@texwrap 3d bordercolor,Fail
 spec@!opengl 1.2@texwrap 3d bordercolor@GL_RGBA8- border color only,Fail
@@ -2148,6 +2160,9 @@ spec@!opengl 1.2@two-sided-lighting-separate-specular,Fail
 spec@!opengl 1.3@gl-1.3-texture-env,Fail
 spec@!opengl 1.3@tex3d-depth1,Fail
 spec@!opengl 1.3@tex-border-1,Fail
+
+spec@!opengl 1.4@blendminmax,Fail
+
 spec@!opengl 1.4@gl-1.4-polygon-offset,Fail
 spec@!opengl 1.5@depth-tex-compare,Fail
 spec@!opengl 2.0@gl-2.0-edgeflag,Fail

diff --git a/src/etnaviv/ci/etnaviv-gc2000-skips.txt b/src/etnaviv/ci/etnaviv-gc2000-skips.txt
index e5b1060..368c236 100644 (file)
--- a/src/etnaviv/ci/etnaviv-gc2000-skips.txt
+++ b/src/etnaviv/ci/etnaviv-gc2000-skips.txt
@@ -11,3 +11,4 @@ shaders@glsl-uniform-interstage-limits@subdivide 5- statechanges
 spec@arb_internalformat_query2@all internalformat_<x>_type pname checks
 spec@glsl-1.20@execution@tex-miplevel-selection gl2:texture(bias) 2dshadow
 spec@!opengl 1.1@streaming-texture-leak
+spec@arb_map_buffer_alignment@arb_map_buffer_alignment-map-invalidate-range

diff --git a/src/etnaviv/ci/gitlab-ci.yml b/src/etnaviv/ci/gitlab-ci.yml
index 41ddae9..fa92ca9 100644 (file)
--- a/src/etnaviv/ci/gitlab-ci.yml
+++ b/src/etnaviv/ci/gitlab-ci.yml
@@ -56,6 +56,7 @@ gc2000_piglit:
   variables:
     PIGLIT_PLATFORM: gbm
     PIGLIT_PROFILES: gpu
+    TEST_PHASE_TIMEOUT: 40
 
 gc7000_gles2:
   extends: