ci: Don't forget to set NIR_VALIDATE in baremetal runs.

Given that a530 doesn't have cpufreq, we really don't have the time to be
running the validator on all of deqp.  This also helps explain why I had
to go to such a small fraction on the a3xx gles3 run (which we can now
increase).  However, a3xx gles2 seems to be fast enough that we can leave
it enabled and get coverage for older chips.

Because we run more tests now, clear out some stale xfails from the a3xx
list.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1b0fb67a7c250dd67dc1670f667bc4a5c9b617a..bd31bb06100eb2d09aeb954f45aa65014c004212 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -851,6 +851,7 @@ arm64_a306_gles2:
     DEQP_VER: gles2
     DEQP_PARALLEL: 4
     DEQP_EXPECTED_RENDERER: FD307
+    # NIR_VALIDATE=0 left intentionally unset as a3xx is fast enough at its small testsuite.
   script:
     - .gitlab-ci/bare-metal/fastboot.sh
   needs:
@@ -860,7 +861,7 @@ arm64_a306_gles2:
   tags:
     - google-freedreno-db410c
 
-# Disabled due to flaky results
+# Fractional run, single threaded, due to flaky results
 arm64_a306_gles3:
   extends:
     - arm64_a306_gles2
@@ -868,7 +869,8 @@ arm64_a306_gles3:
     DEQP_VER: gles3
     DEQP_PARALLEL: 1
     CI_NODE_INDEX: 1
-    CI_NODE_TOTAL: 50
+    CI_NODE_TOTAL: 25
+    NIR_VALIDATE: 0
 
 arm64_a530_gles2:
   extends:
@@ -882,6 +884,7 @@ arm64_a530_gles2:
     DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt
     DEQP_SKIPS: deqp-freedreno-a530-skips.txt
     DEQP_EXPECTED_RENDERER: FD530
+    NIR_VALIDATE: 0
   tags:
     - google-freedreno-db820c
 

diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 7b9e6162a071c9db324f710ea58b2f2a48b11461..f01671501500777ee202c9b44983b251ef2aff27 100755 (executable)
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -67,8 +67,10 @@ for var in \
     CI_RUNNER_DESCRIPTION \
     DEQP_EXPECTED_RENDERER \
     DEQP_PARALLEL \
+    DEQP_RUN_SUFFIX \
     DEQP_VER \
     FLAKES_CHANNEL \
+    NIR_VALIDATE \
     ; do
   val=`echo ${!var} | sed 's|"||g'`
   echo "export $var=\"${val}\"" >> rootfs/set-job-env-vars.sh

diff --git a/.gitlab-ci/deqp-freedreno-a307-fails.txt b/.gitlab-ci/deqp-freedreno-a307-fails.txt
index a79de5dca1470150b90223bfae1a4bfdada99cac..68d6f1ee9680da24634c5f1ae9c846b2aa07dde1 100644 (file)
--- a/.gitlab-ci/deqp-freedreno-a307-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a307-fails.txt
@@ -60,12 +60,6 @@ dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_dst_y
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_x
 dEQP-GLES3.functional.fbo.blit.rect.nearest_consistency_min_reverse_src_y
 dEQP-GLES3.functional.fbo.color.blend.r8_src_over
-dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.r8i
-dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.r8ui
-dEQP-GLES3.functional.fbo.completeness.renderable.renderbuffer.color0.rgb10_a2ui
-dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.r8i
-dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.r8ui
-dEQP-GLES3.functional.fbo.completeness.renderable.texture.color0.rgb10_a2ui
 dEQP-GLES3.functional.fbo.depth.basic.depth24_stencil8
 dEQP-GLES3.functional.fbo.depth.basic.depth32f_stencil8
 dEQP-GLES3.functional.fbo.depth.basic.depth_component16
@@ -154,7 +148,6 @@ dEQP-GLES3.functional.multisample.fbo_max_samples.proportionality_sample_coverag
 dEQP-GLES3.functional.multisample.fbo_max_samples.sample_coverage_invert
 dEQP-GLES3.functional.negative_api.buffer.blit_framebuffer_multisample
 dEQP-GLES3.functional.negative_api.buffer.read_pixels_fbo_format_mismatch
-dEQP-GLES3.functional.negative_api.vertex_array.draw_elements
 dEQP-GLES3.functional.negative_api.vertex_array.draw_elements_instanced
 dEQP-GLES3.functional.negative_api.vertex_array.draw_range_elements
 dEQP-GLES3.functional.occlusion_query.depth_clear
@@ -179,8 +172,6 @@ dEQP-GLES3.functional.occlusion_query.scissor_stencil_write_stencil_clear
 dEQP-GLES3.functional.occlusion_query.stencil_clear
 dEQP-GLES3.functional.occlusion_query.stencil_write
 dEQP-GLES3.functional.occlusion_query.stencil_write_stencil_clear
-dEQP-GLES3.functional.pbo.renderbuffer.rgb10_a2ui_clears
-dEQP-GLES3.functional.pbo.renderbuffer.rgb10_a2ui_triangles
 dEQP-GLES3.functional.polygon_offset.fixed16_displacement_with_units
 dEQP-GLES3.functional.polygon_offset.fixed16_render_with_units
 dEQP-GLES3.functional.rasterization.fbo.rbo_multisample_max.interpolation.lines_wide
@@ -425,27 +416,7 @@ dEQP-GLES3.functional.state_query.integers.max_samples_getfloat
 dEQP-GLES3.functional.state_query.integers.max_samples_getinteger64
 dEQP-GLES3.functional.state_query.rbo.renderbuffer_component_size_color
 dEQP-GLES3.functional.texture.mipmap.cube.max_level.linear_nearest
-dEQP-GLES3.functional.texture.specification.basic_teximage2d.rgb10_a2ui_2d
-dEQP-GLES3.functional.texture.specification.basic_teximage2d.rgb10_a2ui_cube
-dEQP-GLES3.functional.texture.specification.basic_teximage3d.rgb10_a2ui_2d_array
-dEQP-GLES3.functional.texture.specification.basic_teximage3d.rgb10_a2ui_3d
-dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.rgb10_a2ui_2d
-dEQP-GLES3.functional.texture.specification.basic_texsubimage2d.rgb10_a2ui_cube
-dEQP-GLES3.functional.texture.specification.basic_texsubimage3d.rgb10_a2ui_3d
 dEQP-GLES3.functional.texture.specification.random_teximage2d.cube_3
-dEQP-GLES3.functional.texture.specification.teximage2d_depth.depth_component32f
-dEQP-GLES3.functional.texture.specification.teximage2d_pbo.rgb10_a2ui_2d
-dEQP-GLES3.functional.texture.specification.teximage2d_pbo.rgb10_a2ui_cube
-dEQP-GLES3.functional.texture.specification.teximage3d_pbo.rgb10_a2ui_2d_array
-dEQP-GLES3.functional.texture.specification.teximage3d_pbo.rgb10_a2ui_3d
-dEQP-GLES3.functional.texture.specification.texstorage2d.format.rgb10_a2ui_2d
-dEQP-GLES3.functional.texture.specification.texstorage2d.format.rgb10_a2ui_cube
-dEQP-GLES3.functional.texture.specification.texstorage3d.format.rgb10_a2ui_2d_array
-dEQP-GLES3.functional.texture.specification.texstorage3d.format.rgb10_a2ui_3d
-dEQP-GLES3.functional.texture.specification.texsubimage2d_pbo.rgb10_a2ui_2d
-dEQP-GLES3.functional.texture.specification.texsubimage2d_pbo.rgb10_a2ui_cube
-dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb10_a2ui_2d_array
-dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb10_a2ui_3d
 dEQP-GLES3.functional.texture.units.2_units.mixed.1
 dEQP-GLES3.functional.texture.units.2_units.mixed.9
 dEQP-GLES3.functional.texture.units.2_units.only_3d.5
@@ -478,7 +449,6 @@ dEQP-GLES3.functional.texture.units.all_units.mixed.6
 dEQP-GLES3.functional.texture.units.all_units.mixed.8
 dEQP-GLES3.functional.texture.units.all_units.mixed.9
 dEQP-GLES3.functional.texture.units.all_units.only_2d.0
-dEQP-GLES3.functional.texture.units.all_units.only_2d.5
 dEQP-GLES3.functional.texture.units.all_units.only_2d.6
 dEQP-GLES3.functional.texture.units.all_units.only_2d_array.0
 dEQP-GLES3.functional.texture.units.all_units.only_2d_array.5
@@ -487,7 +457,6 @@ dEQP-GLES3.functional.texture.units.all_units.only_3d.5
 dEQP-GLES3.functional.texture.units.all_units.only_3d.6
 dEQP-GLES3.functional.texture.units.all_units.only_cube.1
 dEQP-GLES3.functional.texture.units.all_units.only_cube.2
-dEQP-GLES3.functional.transform_feedback.basic_types.separate.points.highp_mat2x4
 dEQP-GLES3.functional.transform_feedback.interpolation.centroid.highp_vec4_lines_interleaved
 dEQP-GLES3.functional.transform_feedback.interpolation.centroid.highp_vec4_lines_separate
 dEQP-GLES3.functional.transform_feedback.interpolation.centroid.highp_vec4_triangles_interleaved
@@ -506,6 +475,7 @@ dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.8
 dEQP-GLES3.functional.transform_feedback.random.interleaved.lines.9
 dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.1
 dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.3
+dEQP-GLES3.functional.transform_feedback.random.interleaved.triangles.8
 dEQP-GLES3.functional.transform_feedback.random.separate.lines.10
 dEQP-GLES3.functional.transform_feedback.random.separate.lines.2
 dEQP-GLES3.functional.transform_feedback.random.separate.lines.4