From 088c7c61cfa9bb8d9066f26a836dd8c08e61eaac Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Tue, 18 May 2021 12:31:01 +0300 Subject: [PATCH] ci: Uprev piglit to 9d87cc3d79e ("framework/replay: send backend's subprocess stderr to sys.stderr") This pulls in a fix for replayer to make the backends send their stderr to sys.stderr always. v2: - Updated piglit results for llvmpipe, softpipe, zink and radeonsi-stoney. Signed-off-by: Andres Gomez Reviewed-by: Tomeu Vizoso [v1] Reviewed-by: Martin Peres [v1] Part-of: --- .gitlab-ci.yml | 6 +++--- .gitlab-ci/container/build-piglit.sh | 2 +- .../drivers/llvmpipe/ci/llvmpipe-quick_gl.txt | 9 +++++++++ .../radeonsi/ci/piglit-radeonsi-stoney-fails.txt | 13 ++++++++++++- src/gallium/drivers/softpipe/ci/softpipe-quick.txt | 9 +++++++++ .../drivers/zink/ci/piglit-zink-lvp-fails.txt | 1 + 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5427bf34494..ea835e32dca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -413,13 +413,13 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-gl "2021-05-14-vkglcts-1.2.6.1" + MESA_IMAGE_TAG: &x86_test-gl "2021-05-19-piglit" # Debian 11 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-vk "2021-05-14-vkglcts-1.2.6.1" + MESA_IMAGE_TAG: &x86_test-vk "2021-05-19-piglit" # Debian 11 based ARM build image arm_build: @@ -447,7 +447,7 @@ arm_build: variables: GIT_STRATEGY: fetch KERNEL_URL: "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc2-for-mesa-ci-4a93e50f5c34/linux-v5.13-rc2-for-mesa-ci-4a93e50f5c34.tar.bz2" - MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-18-v5.13-rc2-4" + MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-19-piglit" DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_IMAGE_TAG}--${MESA_TEMPLATES_COMMIT}" script: - .gitlab-ci/container/lava_build.sh diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 4aa9b7fe285..2ac3287e96b 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 3351e8952c7e4e1e9db61cddc556efc60b4d8f37 +git checkout 9d87cc3d79e0c7e572273b94dcb51882f4d83d7f 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/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt index 75ffe1ba273..0d83bbd98c9 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt @@ -846,6 +846,14 @@ spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_wrong_display_same_thread: spec/egl_khr_gl_image/egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24: fail spec/egl_nok_swap_region/basic: skip spec/egl_nok_texture_from_pixmap/basic: skip +spec/ext_clear_texture/ext_clear_texture-3d: skip +spec/ext_clear_texture/ext_clear_texture-base-formats: skip +spec/ext_clear_texture/ext_clear_texture-clear-max-level: skip +spec/ext_clear_texture/ext_clear_texture-cube: skip +spec/ext_clear_texture/ext_clear_texture-error: skip +spec/ext_clear_texture/ext_clear_texture-multisample: skip +spec/ext_clear_texture/ext_clear_texture-stencil: skip +spec/ext_clear_texture/ext_clear_texture-texview: skip spec/ext_depth_bounds_test/depth_bounds: skip spec/ext_direct_state_access/indexed-state-queries 12/getdoublei_vext: skip spec/ext_direct_state_access/indexed-state-queries 12/getfloati_vext: skip @@ -864,6 +872,7 @@ spec/ext_external_objects/vk-image-overwrite: skip spec/ext_external_objects/vk-pix-buf-update-errors: skip spec/ext_external_objects/vk-semaphores: skip spec/ext_external_objects/vk-semaphores-2: skip +spec/ext_external_objects/vk-stencil-display: skip spec/ext_external_objects/vk-vert-buf-reuse: skip spec/ext_external_objects/vk-vert-buf-update-errors: skip spec/ext_external_objects_fd/memory-object-api-errors: skip diff --git a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt b/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt index 82fe6b31a24..a3c836f1722 100644 --- a/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt +++ b/src/gallium/drivers/radeonsi/ci/piglit-radeonsi-stoney-fails.txt @@ -10,29 +10,36 @@ spec@arb_texture_float@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_rg@texwrap formats bordercolor-swizzled,Fail spec@arb_texture_rg@texwrap formats-float bordercolor-swizzled,Fail spec@arb_texture_rg@texwrap formats-int bordercolor-swizzled,Fail +spec@arb_texture_rgb10_a2ui@texwrap formats bordercolor-swizzled,Fail spec@arb_timer_query@timestamp-get,Fail +spec@egl 1.4@egl-copy-buffers,Crash spec@egl 1.4@eglterminate then unbind context,Fail spec@egl_chromium_sync_control@conformance,Fail +spec@egl_ext_protected_content@conformance,Fail spec@egl_khr_surfaceless_context@viewport,Fail +spec@egl_mesa_configless_context@basic,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail spec@ext_framebuffer_multisample@turn-on-off 2,Fail 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_image_dma_buf_import@ext_image_dma_buf_import-export,Fail -spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-intel_external_sampler_only,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_attributes,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-invalid_hints,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-missing_attributes,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-refcount,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-reimport-bug,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_ayuv,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_nv12,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p010,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_p016,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_uyvy,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xrgb8888,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_xyuv,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y210,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y212,Fail +spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y410,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y412,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_y416,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuv420,Fail @@ -40,12 +47,16 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 spec@ext_image_dma_buf_import@ext_image_dma_buf_import-unsupported_format,Fail spec@ext_packed_float@texwrap formats bordercolor-swizzled,Fail spec@ext_texture_compression_rgtc@texwrap formats bordercolor-swizzled,Fail +spec@ext_texture_compression_s3tc@texwrap formats bordercolor-swizzled,Fail spec@ext_texture_integer@fbo-integer,Fail spec@ext_texture_integer@texwrap formats bordercolor-swizzled,Fail spec@ext_texture_shared_exponent@texwrap formats bordercolor-swizzled,Fail +spec@ext_texture_snorm@texwrap formats bordercolor-swizzled,Fail spec@ext_texture_srgb@texwrap formats bordercolor-swizzled,Fail +spec@ext_texture_srgb@texwrap formats-s3tc bordercolor-swizzled,Fail spec@glsl-1.50@execution@geometry@tri-strip-ordering-with-prim-restart gl_triangle_strip_adjacency other,Fail spec@khr_texture_compression_astc@miptree-gl srgb-fp,Fail +spec@khr_texture_compression_astc@miptree-gles srgb-fp,Fail spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail spec@oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt index 32b59398b7e..f0e27c7219a 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt @@ -1850,6 +1850,14 @@ spec/egl_khr_fence_sync/conformance/eglcreatesynckhr_wrong_display_same_thread: spec/egl_khr_gl_image/egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24: fail spec/egl_nok_swap_region/basic: skip spec/egl_nok_texture_from_pixmap/basic: skip +spec/ext_clear_texture/ext_clear_texture-3d: skip +spec/ext_clear_texture/ext_clear_texture-base-formats: skip +spec/ext_clear_texture/ext_clear_texture-clear-max-level: skip +spec/ext_clear_texture/ext_clear_texture-cube: skip +spec/ext_clear_texture/ext_clear_texture-error: skip +spec/ext_clear_texture/ext_clear_texture-multisample: skip +spec/ext_clear_texture/ext_clear_texture-stencil: skip +spec/ext_clear_texture/ext_clear_texture-texview: skip spec/ext_demote_to_helper_invocation/execution/demote: skip spec/ext_demote_to_helper_invocation/execution/demote_with_derivatives: skip spec/ext_direct_state_access/indexed-state-queries 12/getdoublei_vext: skip @@ -1869,6 +1877,7 @@ spec/ext_external_objects/vk-image-overwrite: skip spec/ext_external_objects/vk-pix-buf-update-errors: skip spec/ext_external_objects/vk-semaphores: skip spec/ext_external_objects/vk-semaphores-2: skip +spec/ext_external_objects/vk-stencil-display: skip spec/ext_external_objects/vk-vert-buf-reuse: skip spec/ext_external_objects/vk-vert-buf-update-errors: skip spec/ext_external_objects_fd/memory-object-api-errors: skip diff --git a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt index e6be871b426..f6cd5fc05a8 100644 --- a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt @@ -104,6 +104,7 @@ spec@ext_external_objects@vk-image-overwrite,Fail spec@ext_external_objects@vk-pix-buf-update-errors,Fail spec@ext_external_objects@vk-semaphores-2,Fail spec@ext_external_objects@vk-semaphores,Fail +spec@ext_external_objects@vk-stencil-display,Fail spec@ext_external_objects@vk-vert-buf-reuse,Fail spec@ext_external_objects@vk-vert-buf-update-errors,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail