ci: Enable NIR_VALIDATE everywhere.

I wasted a bunch of time today tracking down a spurious test results
change due to a driver invoking UB by running tests where NIR validation
had failed (instruction reading from components beyond vector size).  If
we need to shrink our coverage to get runtimes down, it will still be
better to be catching validation errors in CI.

To keep the test jobs runtime under 10 minutes, I've split a530's gles2 to
two different jobs.

Acked-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7203>
This commit is contained in:
Eric Anholt 2020-10-16 17:20:11 -07:00 committed by Marge Bot
parent 4ca1030774
commit b05c107d74
3 changed files with 27 additions and 23 deletions

View File

@ -990,7 +990,6 @@ piglit-quick_gl:
extends: .piglit-test
variables:
LP_NUM_THREADS: 0
NIR_VALIDATE: 0
PIGLIT_OPTIONS: >
--process-isolation false
-x egl_ext_device_
@ -1006,14 +1005,12 @@ piglit-glslparser:
extends: .piglit-test
variables:
LP_NUM_THREADS: 0
NIR_VALIDATE: 0
PIGLIT_PROFILES: glslparser
piglit-quick_shader:
extends: .piglit-test
variables:
LP_NUM_THREADS: 1
NIR_VALIDATE: 0
PIGLIT_PROFILES: quick_shader
.deqp-test:
@ -1047,7 +1044,6 @@ piglit-quick_shader:
llvmpipe-gles2:
variables:
DEQP_VER: gles2
NIR_VALIDATE: 0
# Don't use threads inside llvmpipe, we've already got all cores
# busy at the deqp-runner level.
LP_NUM_THREADS: 0
@ -1091,7 +1087,6 @@ softpipe-gl:
virgl-gles2-on-gl:
variables:
DEQP_VER: gles2
NIR_VALIDATE: 0
DEQP_NO_SAVE_RESULTS: 1
DEQP_SKIPS: deqp-virgl-gl-skips.txt
# Don't use threads inside llvmpipe, we've already got all cores
@ -1194,15 +1189,11 @@ arm64_a630_gles31:
extends: arm64_a630_gles2
variables:
DEQP_VER: gles31
# gles31 is about 12 minutes with validation enabled.
NIR_VALIDATE: 0
arm64_a630_gles3:
extends: arm64_a630_gles2
variables:
DEQP_VER: gles3
# gles3 is about 15 minutes with validation enabled.
NIR_VALIDATE: 0
# We almost always manage to lower UBOs back to constant uploads in
# the test suite, so get a little testing for it here.
@ -1250,7 +1241,6 @@ arm64_a630_gmem:
CI_NODE_INDEX: 1
CI_NODE_TOTAL: 5
FD_MESA_DEBUG: nobypass
NIR_VALIDATE: 1
arm64_a630_gl:
extends: arm64_a630_gles2
@ -1347,7 +1337,6 @@ arm64_a306_gles2:
DEQP_EXPECTED_RENDERER: FD307
# Since we can't get artifacts back yet, skip making them.
DEQP_NO_SAVE_RESULTS: 1
# NIR_VALIDATE=0 left intentionally unset as a3xx is fast enough at its small testsuite.
script:
- ./install/bare-metal/fastboot.sh
needs:
@ -1365,7 +1354,6 @@ arm64_a306_gles3:
DEQP_PARALLEL: 1
CI_NODE_INDEX: 1
CI_NODE_TOTAL: 25
NIR_VALIDATE: 0
# Fractional runs with debug options. Note that since we're not
# hitting the iommu faults, we can run in parallel (derive from gles2, not gles3).
@ -1377,7 +1365,7 @@ arm64_a306_gles3_options:
# Check that the non-constbuf UBO case works.
- DEQP_RUN_SUFFIX=-nouboopt IR3_SHADER_DEBUG=nouboopt DEQP_CASELIST_FILTER="functional.*ubo" ./install/bare-metal/fastboot.sh
arm64_a530_gles2:
.arm64_a530_deqp:
extends:
- arm64_a306_gles2
variables:
@ -1389,13 +1377,17 @@ arm64_a530_gles2:
DEQP_EXPECTED_FAILS: deqp-freedreno-a530-fails.txt
DEQP_FLAKES: deqp-freedreno-a530-flakes.txt
DEQP_EXPECTED_RENDERER: FD530
NIR_VALIDATE: 0
tags:
- google-freedreno-db820c
arm64_a530_gles2:
extends:
- .arm64_a530_deqp
parallel: 2
arm64_a530_gles3:
extends:
- arm64_a530_gles2
- .arm64_a530_deqp
variables:
DEQP_VER: gles3
DEQP_PARALLEL: 1

View File

@ -297,7 +297,7 @@ radeonsi-stoney-gles2:amd64:
GPU_VERSION: radeonsi-stoney
BOOT_METHOD: depthcharge
KERNEL_IMAGE_TYPE: ""
ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY NIR_VALIDATE=0"
ENV_VARS: "DEQP_PARALLEL=4 DEQP_EXPECTED_RENDERER=STONEY"
tags:
- mesa-ci-aarch64-lava-collabora

View File

@ -238,15 +238,23 @@ spec/arb_gpu_shader_fp64/execution/inout/vs-out-fs-in-s2/3-double-float: crash
spec/arb_gpu_shader_fp64/execution/inout/vs-out-fs-in-s2/3-dvec2-float: crash
spec/arb_gpu_shader_fp64/execution/inout/vs-out-fs-in-s2/3-dvec3-float: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-float-float-i64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-float-float-i64vec3: fail
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-float-float-i64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-float-float-int64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-float-float-u64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-i64vec2: fail
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-float-float-u64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-float-float-uint64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-i64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-i64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-int64_t/3/2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-u64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-u64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-uint64_t/3/2: fail
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float-uint64_t/3/2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float/3-i64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float/3-i64vec3: fail
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float/3-i64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float/3-int64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float/3-u64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float/3-u64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-float/3-uint64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-s2/2-s3/2-float-int64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-s2/2-s3/2-float-uint64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-s2/2-s3/2-vec3-int64_t: crash
@ -262,8 +270,12 @@ spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-s2/3-u64vec2-float: cr
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-s2/3-u64vec3-float: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-s2/3-uint64_t-float: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-i64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-i64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-int64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-int64_t/3/2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-u64vec2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-u64vec3: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-uint64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s1-vec3-uint64_t/3/2: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s2/2-s3/2-float-int64_t: crash
spec/arb_gpu_shader_int64/execution/inout/vs-out-fs-in-s2/2-s3/2-float-uint64_t: crash
@ -557,9 +569,9 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
summary:
name: results
---- --------
pass: 15819
fail: 87
crash: 154
pass: 15807
fail: 83
crash: 170
skip: 315
timeout: 0
warn: 0