From a8d2b288eee38c7c8535af4342e00b8f7e75a087 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Thu, 19 Jan 2023 15:10:23 +0100 Subject: [PATCH] ci/piglit: 2023-01-19 uprev Emergency uprev to get robustness against http 50x errors for traces. Signed-off-by: David Heidelberg Part-of: --- .gitlab-ci/container/build-piglit.sh | 4 +++- .gitlab-ci/container/debian/x86_test-vk.sh | 4 ++-- src/amd/ci/radeonsi-raven-fails.txt | 3 +++ src/amd/ci/radeonsi-stoney-fails.txt | 5 ++++- src/broadcom/ci/broadcom-rpi3-fails.txt | 4 +++- src/broadcom/ci/broadcom-rpi4-fails.txt | 2 ++ src/freedreno/ci/freedreno-a630-fails.txt | 2 ++ src/gallium/drivers/lima/ci/lima-fails.txt | 3 ++- src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt | 2 ++ src/gallium/drivers/softpipe/ci/softpipe-fails.txt | 2 ++ src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt | 2 ++ src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 2 ++ src/gallium/drivers/zink/ci/zink-lvp-skips.txt | 6 ------ src/intel/ci/iris-kbl-fails.txt | 3 +++ 14 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index d932d74bc6d..6231d2637df 100644 --- a/.gitlab-ci/container/build-piglit.sh +++ b/.gitlab-ci/container/build-piglit.sh @@ -3,9 +3,11 @@ set -ex +REV="f4539c31b1e98502e1224b5a91f8e124527e9cb7" + git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit pushd /piglit -git checkout 1cd716180cfb6ef0c1fc54702460ef49e5115791 +git checkout "$REV" 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/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index 908495d996d..c88e75178f3 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -105,9 +105,9 @@ wine64 \ . .gitlab-ci/container/build-hang-detection.sh -############### Build piglit +############### Build piglit replayer -PIGLIT_BUILD_TARGETS="piglit_replayer" PIGLIT_OPTS="-DPIGLIT_BUILD_GLX_TESTS=ON" . .gitlab-ci/container/build-piglit.sh +PIGLIT_BUILD_TARGETS="piglit_replayer" . .gitlab-ci/container/build-piglit.sh ############### Build Fossilize diff --git a/src/amd/ci/radeonsi-raven-fails.txt b/src/amd/ci/radeonsi-raven-fails.txt index a66c79b96a3..97629fed0a1 100644 --- a/src/amd/ci/radeonsi-raven-fails.txt +++ b/src/amd/ci/radeonsi-raven-fails.txt @@ -191,3 +191,6 @@ spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152 spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail + +spec@!opengl 1.1@line-smooth-coverage,Fail +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/amd/ci/radeonsi-stoney-fails.txt b/src/amd/ci/radeonsi-stoney-fails.txt index 6de5daf28c3..772f6a0dcb3 100644 --- a/src/amd/ci/radeonsi-stoney-fails.txt +++ b/src/amd/ci/radeonsi-stoney-fails.txt @@ -235,4 +235,7 @@ spec@khr_texture_compression_astc@miptree-gles srgb-fp@sRGB decode full precisio spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail spec@khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp@sRGB decode full precision,Fail spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail -spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail \ No newline at end of file +spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode full precision,Fail + +spec@!opengl 1.1@line-smooth-coverage,Fail +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index 3a8465d5cf5..34a1a1b8d44 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -950,7 +950,6 @@ spec@arb_internalformat_query2@max dimensions related pname checks@GL_MAX_DEPTH, spec@arb_internalformat_query2@max dimensions related pname checks@GL_MAX_HEIGHT,Fail spec@arb_internalformat_query2@max dimensions related pname checks@GL_MAX_WIDTH,Fail spec@arb_occlusion_query2@render,Fail -spec@arb_occlusion_query@occlusion_query,Fail spec@arb_occlusion_query@occlusion_query_conform,Fail spec@arb_occlusion_query@occlusion_query_conform@GetObjivAval_multi2,Fail spec@arb_occlusion_query@occlusion_query_meta_fragments,Fail @@ -1222,3 +1221,6 @@ wayland-dEQP-EGL.functional.create_context.no_config,Fail # // 0x00000000 returned # // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail + +spec@!opengl 1.1@line-smooth-stipple,Fail +spec@glsl-1.10@execution@variable-indexing@vs-output-array-vec2-index-wr-no-unroll,Fail diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index 82282d7e982..1e7694f9f25 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -373,3 +373,5 @@ dEQP-VK.compute.workgroup_memory_explicit_layout.zero_ext.block_with_offset,Cras # // 0x00000000 returned # // ERROR expected: EGL_BAD_CONFIG or EGL_BAD_PARAMETER, Got: EGL_BAD_NATIVE_PIXMAP wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail + +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 594449e1832..5b226e35ed9 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -440,3 +440,5 @@ wayland-dEQP-EGL.functional.wide_color.window_fp16_default_colorspace,Fail # SRGBReadWritePixels FAILED (7 errors) # ../../tests/SRGBReadWritePixelsTest.cpp:214 Could not create sRGB surface context. [OpenGL] SRGBReadWritePixels,Fail + +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt index bd6d658c11e..e92c496ff76 100644 --- a/src/gallium/drivers/lima/ci/lima-fails.txt +++ b/src/gallium/drivers/lima/ci/lima-fails.txt @@ -109,7 +109,6 @@ spec@arb_framebuffer_srgb@framebuffer-srgb,Fail spec@arb_occlusion_query2@render,Fail spec@arb_occlusion_query@occlusion_query_conform,Fail spec@arb_occlusion_query@occlusion_query_conform@GetObjivAval_multi2,Fail -spec@arb_occlusion_query@occlusion_query,Fail spec@arb_occlusion_query@occlusion_query_meta_fragments,Fail spec@arb_occlusion_query@occlusion_query_meta_save,Fail spec@arb_pixel_buffer_object@cubemap npot pbo,Fail @@ -668,3 +667,5 @@ spec@ext_texture_compression_s3tc@compressedteximage gl_compressed_srgb_alpha_s3 spec@ext_texture_compression_s3tc@compressedteximage gl_compressed_srgb_alpha_s3tc_dxt3_ext,Fail spec@ext_texture_compression_s3tc@compressedteximage gl_compressed_srgb_alpha_s3tc_dxt5_ext,Fail spec@ext_texture_compression_s3tc@compressedteximage gl_compressed_srgb_s3tc_dxt1_ext,Fail + +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt index 7b3046b91bf..5921b1f5fae 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt @@ -245,3 +245,5 @@ wayland-dEQP-EGL.functional.negative_api.create_pixmap_surface,Fail # Image comparison failed: reference = 0.000488281, expected = 0:1:0:0, result = 0:1:0:3 # [...] wayland-dEQP-EGL.functional.wide_color.pbuffer_888_colorspace_default,Fail + +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt index e9c8a5e04ce..b3ca9ac59c6 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt @@ -1327,3 +1327,5 @@ spec@arb_texture_buffer_object@texture-buffer-size-clamp,Fail # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152 spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail + +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index a633ac4ee87..c4602d12839 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -731,3 +731,5 @@ spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail spec@arb_enhanced_layouts@matching_fp64_types_1,Crash spec@arb_enhanced_layouts@matching_fp64_types_2,Crash spec@arb_enhanced_layouts@matching_fp64_types_3,Crash + +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt index e61edddab14..b80026d2296 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt @@ -346,3 +346,5 @@ spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec2-vec2,Fail spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec3-vec3,Fail spec@glsl-4.00@execution@conversion@vert-conversion-explicit-dvec4-vec4,Fail spec@glsl-4.50@execution@ssbo-atomiccompswap-int,Fail + +spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/zink/ci/zink-lvp-skips.txt b/src/gallium/drivers/zink/ci/zink-lvp-skips.txt index c9c26399255..5bb31f5cace 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-skips.txt @@ -46,9 +46,3 @@ spec@arb_texture_rg@fbo-blending-formats #these need format conversions that gallium doesn't implement yet spec@arb_texture_buffer_object@formats.*arb.* - -# After piglit uprev, got this crash: -# ../src/gallium/frontends/lavapipe/lvp_device.c:1720: lvp_AllocateMemory: -# Assertion `!export_info->handleTypes || export_info->handleTypes == VK_EXTERNAL_MEMORY_HANDLE_TYPE_OPAQUE_FD_BIT' failed. -# https://gitlab.freedesktop.org/mesa/mesa/-/issues/7609 -spec@egl 1.4@egl-ext_egl_image_storage diff --git a/src/intel/ci/iris-kbl-fails.txt b/src/intel/ci/iris-kbl-fails.txt index 723dbd9e1af..b34901cc015 100644 --- a/src/intel/ci/iris-kbl-fails.txt +++ b/src/intel/ci/iris-kbl-fails.txt @@ -159,3 +159,6 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful # https://gitlab.freedesktop.org/mesa/mesa/-/issues/7152 spec@ext_transform_feedback@builtin-varyings gl_culldistance,Fail + +spec@!opengl 1.1@line-smooth-coverage,Fail +spec@!opengl 1.1@line-smooth-stipple,Fail