From 3cf28d16f61016a8f76c222e12e9cb12a3c84e68 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Wed, 16 Mar 2022 14:49:21 -0700 Subject: [PATCH] ci: Uprev deqp-runner and piglit. deqp-runner uprevved to reduce memory usage on HW runners, let us experiment with shader cache on tmpfs, and hopefully provide a tool for virgl to be able to plausibly run piglit under crosvm instead of vtest. piglit uprevved to avoid a flake in softpipe in glx-multithread-texture, and improve performance of the test, too. This also brings in the fbo-blending-format-quirks fix to properly initialize the buffers, fixing some fails/flakes. Acked-by: Pierre-Eric Pelloux-Prayer Part-of: --- .gitlab-ci/container/build-deqp-runner.sh | 2 +- .gitlab-ci/container/build-piglit.sh | 2 +- .gitlab-ci/image-tags.yml | 6 +++--- src/freedreno/ci/freedreno-a307-fails.txt | 20 +++++++++++++++++++ src/freedreno/ci/freedreno-a530-fails.txt | 1 - src/freedreno/ci/freedreno-a530-flakes.txt | 1 + src/freedreno/ci/freedreno-a630-fails.txt | 3 ++- src/freedreno/ci/freedreno-a630-flakes.txt | 4 ---- .../drivers/crocus/ci/crocus-g41-fails.txt | 5 +++++ .../drivers/i915/ci/i915-g33-fails.txt | 1 + .../drivers/llvmpipe/ci/llvmpipe-fails.txt | 7 ++++++- .../drivers/r600/ci/r600-rv770-fails.txt | 1 - .../drivers/r600/ci/r600-rv770-flakes.txt | 1 - .../drivers/r600/ci/r600-turks-flakes.txt | 2 -- .../drivers/softpipe/ci/softpipe-fails.txt | 4 ++++ .../drivers/zink/ci/zink-lvp-fails.txt | 12 +++++++---- 16 files changed, 52 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh index e146e9f05e9..9ae0d99329e 100644 --- a/.gitlab-ci/container/build-deqp-runner.sh +++ b/.gitlab-ci/container/build-deqp-runner.sh @@ -15,7 +15,7 @@ if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}" else # Install from package registry - DEQP_RUNNER_CARGO_ARGS="--version 0.12.0 ${EXTRA_CARGO_ARGS} -- deqp-runner" + DEQP_RUNNER_CARGO_ARGS="--version 0.13.1 ${EXTRA_CARGO_ARGS} -- deqp-runner" fi cargo install --locked \ diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index fb6a22cf245..b19d7c06708 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -4,7 +4,7 @@ set -ex git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit -git checkout 8f6f8967087018aa5eb91da6dc93f0e75acfecbb +git checkout 445711587d461539a4d8f9d35a7fe996a86d3c8d patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS ninja $PIGLIT_BUILD_TARGETS diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index c4a31cb94ad..dc967718aef 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -8,11 +8,11 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-03-29-deqp-bump" - DEBIAN_X86_TEST_VK_TAG: "2022-03-29-deqp-bump" + DEBIAN_X86_TEST_GL_TAG: "2022-04-05-deqp-runner" + DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner" FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5" - KERNEL_ROOTFS_TAG: "2022-03-29-deqp-bump" + KERNEL_ROOTFS_TAG: "2022-04-05-deqp-runner" WINDOWS_X64_BUILD_PATH: "windows/x64_build" WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split" diff --git a/src/freedreno/ci/freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt index 98f29c3fdc1..08f7573283c 100644 --- a/src/freedreno/ci/freedreno-a307-fails.txt +++ b/src/freedreno/ci/freedreno-a307-fails.txt @@ -104,6 +104,26 @@ spec@arb_shading_language_packing@execution@built-in-functions@vs-unpackunorm2x1 spec@ext_gpu_shader4@execution@open-coded-bitfieldreverse,Fail spec@glsl-1.10@execution@temp-array-indexing@glsl-fs-giant-temp-array,Fail spec@glsl-1.10@execution@temp-array-indexing@glsl-vs-giant-temp-array,Fail +spec@glsl-1.10@execution@varying-packing@simple int array,Fail +spec@glsl-1.10@execution@varying-packing@simple int arrays_of_arrays,Fail +spec@glsl-1.10@execution@varying-packing@simple int separate,Fail +spec@glsl-1.10@execution@varying-packing@simple ivec2 array,Fail +spec@glsl-1.10@execution@varying-packing@simple ivec2 arrays_of_arrays,Fail +spec@glsl-1.10@execution@varying-packing@simple ivec2 separate,Fail +spec@glsl-1.10@execution@varying-packing@simple ivec3 array,Fail +spec@glsl-1.10@execution@varying-packing@simple ivec3 arrays_of_arrays,Fail +spec@glsl-1.10@execution@varying-packing@simple ivec3 separate,Fail +spec@glsl-1.10@execution@varying-packing@simple ivec4 separate,Fail +spec@glsl-1.10@execution@varying-packing@simple uint array,Fail +spec@glsl-1.10@execution@varying-packing@simple uint arrays_of_arrays,Fail +spec@glsl-1.10@execution@varying-packing@simple uint separate,Fail +spec@glsl-1.10@execution@varying-packing@simple uvec2 array,Fail +spec@glsl-1.10@execution@varying-packing@simple uvec2 arrays_of_arrays,Fail +spec@glsl-1.10@execution@varying-packing@simple uvec2 separate,Fail +spec@glsl-1.10@execution@varying-packing@simple uvec3 array,Fail +spec@glsl-1.10@execution@varying-packing@simple uvec3 arrays_of_arrays,Fail +spec@glsl-1.10@execution@varying-packing@simple uvec3 separate,Fail +spec@glsl-1.10@execution@varying-packing@simple uvec4 separate,Fail spec@glsl-1.30@execution@fs-large-local-array,Fail spec@glsl-1.30@execution@fs-large-local-array-vec2,Fail spec@glsl-1.30@execution@fs-large-local-array-vec3,Fail diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt index 3e8aa38a800..2931b5e5fbe 100644 --- a/src/freedreno/ci/freedreno-a530-fails.txt +++ b/src/freedreno/ci/freedreno-a530-fails.txt @@ -274,7 +274,6 @@ spec@egl_mesa_configless_context@basic,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail spec@ext_framebuffer_object@fbo-alphatest-nocolor,Fail spec@ext_framebuffer_object@fbo-alphatest-nocolor-ff,Fail -spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail spec@ext_framebuffer_object@fbo-blending-snorm,Fail spec@ext_framebuffer_object@fbo-stencil-gl_stencil_index1-blit,Fail spec@ext_framebuffer_object@fbo-stencil-gl_stencil_index1-copypixels,Fail diff --git a/src/freedreno/ci/freedreno-a530-flakes.txt b/src/freedreno/ci/freedreno-a530-flakes.txt index 4dd3bf95fc7..6e964461922 100644 --- a/src/freedreno/ci/freedreno-a530-flakes.txt +++ b/src/freedreno/ci/freedreno-a530-flakes.txt @@ -59,6 +59,7 @@ dEQP-GLES31.functional.synchronization.inter_call.without_memory_barrier.* dEQP-GLES31.functional.texture.gather.basic.2d_array.rgba8.filter_mode.min_nearest_mipmap_nearest_mag_linear +glx@glx-swap-copy glx@glx-swap-event_interval glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero glx@glx_arb_sync_control@waitformsc diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 06d5b497df2..385e0b1d76a 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -132,6 +132,8 @@ spec@arb_sample_shading@samplemask 4,Fail spec@arb_sample_shading@samplemask 4@noms mask_in_one,Fail spec@arb_sample_shading@samplemask 4@sample mask_in_one,Fail +spec@arb_shader_image_load_store@execution@image-array-out-of-bounds-access-load,Crash + # These 3 fails started to happen after piglit uprev with commit # 0ef03f824d1833a853d1a20b4be121089bb9246c spec@arb_shader_image_load_store@qualifiers,Fail @@ -269,7 +271,6 @@ spec@ext_framebuffer_multisample@sample-alpha-to-coverage 4 color,Fail spec@ext_framebuffer_multisample@sample-alpha-to-coverage 4 depth,Fail spec@ext_framebuffer_object@fbo-alphatest-nocolor,Fail spec@ext_framebuffer_object@fbo-alphatest-nocolor-ff,Fail -spec@ext_framebuffer_object@fbo-blending-format-quirks,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 spec@ext_packed_depth_stencil@texwrap formats bordercolor-swizzled,Fail diff --git a/src/freedreno/ci/freedreno-a630-flakes.txt b/src/freedreno/ci/freedreno-a630-flakes.txt index 69395851673..6664dc3bf33 100644 --- a/src/freedreno/ci/freedreno-a630-flakes.txt +++ b/src/freedreno/ci/freedreno-a630-flakes.txt @@ -155,10 +155,6 @@ spec@arb_shader_image_load_store@indexing@Fragment shader/dynamically uniform in spec@egl_chromium_sync_control@conformance spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test -# First appeared on 2021-07-07 in a container uprev, became frequent by -# 2021-08-04 starting from a pretty clearly unrelated MR -spec@ext_framebuffer_object@fbo-blending-format-quirks - # Flaky since around 2021-04-21. First appeared on # https://gitlab.freedesktop.org/robclark/mesa/-/jobs/9101752 (fd/go-fast) spec@ext_packed_depth_stencil@fbo-clear-formats stencil diff --git a/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt b/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt index 386dcfee387..c33c34d2486 100644 --- a/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt +++ b/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt @@ -256,6 +256,11 @@ spec@ext_texture_format_bgra8888@api-errors,Fail # no info, just fails spec@intel_performance_query@intel_performance_query-issue_2235,Fail +# "Unexpected GL error: GL_INVALID_ENUM 0x500 +# (Error at tests/spec/khr_texture_compression_astc/khr_compressed_astc-basic.c:349) +# Expected GL error: GL_INVALID_OPERATION 0x502" +spec@khr_texture_compression_astc@basic-gles,Fail + spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail spec@khr_texture_compression_astc@miptree-gl srgb-fp@sRGB decode full precision,Fail spec@khr_texture_compression_astc@miptree-gles srgb,Fail diff --git a/src/gallium/drivers/i915/ci/i915-g33-fails.txt b/src/gallium/drivers/i915/ci/i915-g33-fails.txt index 30fdb2c1da4..3be3a515544 100644 --- a/src/gallium/drivers/i915/ci/i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/i915-g33-fails.txt @@ -823,6 +823,7 @@ spec@glsl-1.10@execution@fs-frontfacing-ternary-0.0-neg-1.0,Fail spec@glsl-1.10@execution@fs-frontfacing-ternary-1-neg-1,Fail spec@glsl-1.10@execution@fs-frontfacing-ternary-1.0-neg-1.0,Fail spec@glsl-1.10@execution@fs-frontfacing-ternary-neg-1.0-1.0,Fail +spec@glsl-1.10@execution@fs-frontfacing-ternary-neg-1.0-1.0-alt,Fail spec@glsl-1.10@execution@fs-frontfacing-ternary-vec4-neg-1.0-1.0,Fail spec@glsl-1.10@execution@fs-loop-bounds-unrolled,Fail diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt index 3dd828ea43a..25bc30eb30d 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt @@ -46,7 +46,6 @@ glx@glx-copy-sub-buffer samples=4,Fail glx@glx-make-current,Crash glx@glx-multi-window-single-context,Fail -glx@glx-multithread-texture,Fail glx@glx-swap-copy,Fail glx@glx-swap-pixmap-bad,Fail @@ -109,7 +108,13 @@ spec@arb_program_interface_query@arb_program_interface_query-getprogramresourcei spec@arb_shader_image_load_store@early-z,Fail spec@arb_shader_image_load_store@early-z@occlusion query test/early-z pass,Fail +spec@arb_shader_image_load_store@execution@image-array-out-of-bounds-access-load,Crash +spec@arb_shader_image_load_store@execution@image-array-out-of-bounds-access-store,Crash + spec@arb_shader_texture_lod@execution@arb_shader_texture_lod-texgrad,Fail + +spec@arb_tessellation_shader@execution@tcs-tes-levels-out-of-bounds-write,Crash + spec@egl 1.4@egl-copy-buffers,Fail spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail diff --git a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt index f1252b105e3..336afc8a721 100644 --- a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt +++ b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt @@ -814,7 +814,6 @@ spec@ext_framebuffer_multisample@turn-on-off 4,Fail spec@ext_framebuffer_multisample@turn-on-off 6,Fail spec@ext_framebuffer_multisample@turn-on-off 8,Fail -spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail spec@ext_framebuffer_object@fbo-blending-formats,Fail spec@ext_framebuffer_object@fbo-blending-formats@3,Fail spec@ext_framebuffer_object@fbo-blending-formats@GL_RGB,Fail diff --git a/src/gallium/drivers/r600/ci/r600-rv770-flakes.txt b/src/gallium/drivers/r600/ci/r600-rv770-flakes.txt index 8e2e000bdde..5a891237e13 100644 --- a/src/gallium/drivers/r600/ci/r600-rv770-flakes.txt +++ b/src/gallium/drivers/r600/ci/r600-rv770-flakes.txt @@ -1,5 +1,4 @@ spec@!opengl 3.2@gl-3.2-adj-prims pv-last spec@!opengl 3.2@layered-rendering@gl-layer-render-clipped spec@arb_fragment_layer_viewport@viewport-gs-write-simple -spec@ext_framebuffer_object@fbo-blending-format-quirks spec@glsl-1.30@execution@fs-large-local-array-vec4 diff --git a/src/gallium/drivers/r600/ci/r600-turks-flakes.txt b/src/gallium/drivers/r600/ci/r600-turks-flakes.txt index 1b94f5643d9..4ad2178c585 100644 --- a/src/gallium/drivers/r600/ci/r600-turks-flakes.txt +++ b/src/gallium/drivers/r600/ci/r600-turks-flakes.txt @@ -16,8 +16,6 @@ spec@arb_shader_image_load_store@invalid@ spec@arb_timer_query@timestamp-get spec@ext_timer_query@time-elapsed -spec@ext_framebuffer_object@fbo-blending-format-quirks - spec@arb_texture_cube_map_array@texturesize@tes-texturesize-samplercubearrayshadow spec@glsl-1.50@execution@texturesize@tes-texturesize-sampler1darrayshadow spec@glsl-1.50@execution@texturesize@tes-texturesize-sampler1dshadow diff --git a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt index fa569c2fa82..778b9ef3434 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt @@ -1252,6 +1252,10 @@ spec@ext_texture_srgb@texwrap formats@GL_SRGB8_ALPHA8- NPOT,Fail spec@ext_transform_feedback2@counting with pause,Fail spec@ext_transform_feedback@pipeline-basic-primgen,Fail spec@ext_transform_feedback@primgen-query transform-feedback-disabled,Fail + +spec@glsl-1.30@execution@fs-large-local-array-out-of-bounds-read,Crash +spec@glsl-1.30@execution@fs-large-local-array-out-of-bounds-write,Crash + spec@glsl-1.30@execution@tex-miplevel-selection texturegrad 1d,Fail spec@glsl-1.30@execution@tex-miplevel-selection texturegrad 1darray,Fail spec@glsl-1.30@execution@tex-miplevel-selection texturegrad 1darrayshadow,Fail diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt index de965b3d0f9..2a9ea9f08c4 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt @@ -1,6 +1,3 @@ -#this will naturally be fixed on the next ci piglit uprev -spec@ext_framebuffer_object@fbo-blending-format-quirks,Fail - KHR-GL46.texture_view.view_sampling,Fail dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail @@ -98,7 +95,6 @@ dEQP-GLES31.functional.primitive_bounding_box.wide_points.tessellation_set_per_p glx@glx-copy-sub-buffer,Fail glx@glx-copy-sub-buffer samples=2,Fail glx@glx-copy-sub-buffer samples=4,Fail -glx@glx-multithread-texture,Fail glx@glx-swap-copy,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth,Crash @@ -331,8 +327,16 @@ spec@!opengl 3.0@clearbuffer-depth-cs-probe,Fail spec@arb_post_depth_coverage@arb_post_depth_coverage-multisampling,Fail spec@arb_shader_image_load_store@early-z,Fail spec@arb_shader_image_load_store@early-z@occlusion query test/early-z pass,Fail + +spec@arb_shader_image_load_store@execution@image-array-out-of-bounds-access-load,Crash +spec@arb_shader_image_load_store@execution@image-array-out-of-bounds-access-store,Crash + spec@arb_shader_image_load_store@invalid,Fail spec@arb_shader_image_load_store@invalid@imageLoad/incompatible format test/imageBuffer,Fail + +spec@arb_tessellation_shader@execution@tcs-tes-levels-out-of-bounds-read,Crash +spec@arb_tessellation_shader@execution@tcs-tes-levels-out-of-bounds-write,Crash + spec@khr_texture_compression_astc@array-gles,Fail spec@khr_texture_compression_astc@array-gles@12x12 Block Dim,Fail spec@khr_texture_compression_astc@array-gles@5x5 Block Dim,Fail