Mesa (main): ci: Uprev VK-GL-CTS to 1.2.7.2, and pull in piglit while I'm here.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 2 21:20:36 UTC 2021
Module: Mesa
Branch: main
Commit: 4e28962800f477219854d8fcfa6b44e37a00a5d6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e28962800f477219854d8fcfa6b44e37a00a5d6
Author: Emma Anholt <emma at anholt.net>
Date: Mon Nov 1 10:49:03 2021 -0700
ci: Uprev VK-GL-CTS to 1.2.7.2, and pull in piglit while I'm here.
The VK-GL-CTS fixes some issues for freedreno, and almost all of LVP's
xfails.
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13622>
---
.gitlab-ci.yml | 6 +++---
.gitlab-ci/container/build-deqp.sh | 2 +-
.gitlab-ci/container/build-piglit.sh | 2 +-
src/broadcom/ci/v3d-rpi4-fails.txt | 1 +
src/broadcom/ci/v3dv-rpi4-skips.txt | 1 -
src/etnaviv/ci/etnaviv-gc2000-flakes.txt | 2 ++
src/freedreno/ci/freedreno-a618-fails.txt | 5 -----
src/freedreno/ci/freedreno-a618-skips.txt | 3 ---
src/freedreno/ci/freedreno-a630-fails.txt | 4 ----
src/freedreno/ci/freedreno-a630-skips.txt | 1 -
src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt | 4 ++++
src/gallium/frontends/lavapipe/ci/lvp-asan-skips.txt | 2 ++
src/gallium/frontends/lavapipe/ci/lvp-fails.txt | 15 ---------------
src/gallium/frontends/lavapipe/ci/lvp-skips.txt | 1 -
src/panfrost/ci/panfrost-g52-fails.txt | 1 +
15 files changed, 15 insertions(+), 35 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76996a1413e..92a2e486481 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -410,13 +410,13 @@ debian/x86_test-gl:
variables:
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
- MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-02-lazor"
+ MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-02-deqp"
# Debian 11 based x86 test image for VK
debian/x86_test-vk:
extends: .use-debian/x86_test-base
variables:
- MESA_IMAGE_TAG: &debian-x86_test-vk "2021-2021-10-15-va"
+ MESA_IMAGE_TAG: &debian-x86_test-vk "2021-2021-11-01-deqp"
# Debian 11 based ARM build image
debian/arm_build:
@@ -465,7 +465,7 @@ fedora/x86_build:
variables:
GIT_STRATEGY: fetch
KERNEL_URL: *kernel-rootfs-url
- MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-02-lazor"
+ MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-02-deqp"
DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
script:
- .gitlab-ci/container/lava_build.sh
diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 616d504a35d..9010e644dc8 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -6,7 +6,7 @@ git config --global user.email "mesa at example.com"
git config --global user.name "Mesa CI"
git clone \
https://github.com/KhronosGroup/VK-GL-CTS.git \
- -b vulkan-cts-1.2.7.1 \
+ -b vulkan-cts-1.2.7.2 \
--depth 1 \
/VK-GL-CTS
pushd /VK-GL-CTS
diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index 5bc07ed0481..680f1f87e61 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 7d7dd2688c214e1b3c00f37226500cbec4a58efb
+git checkout 83bc56abf2686e2cd9024a152e121ca4aa524985
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/broadcom/ci/v3d-rpi4-fails.txt b/src/broadcom/ci/v3d-rpi4-fails.txt
index 8ead565b4b8..4c1db5ba04b 100644
--- a/src/broadcom/ci/v3d-rpi4-fails.txt
+++ b/src/broadcom/ci/v3d-rpi4-fails.txt
@@ -337,4 +337,5 @@ spec at nv_image_formats@compiler at declaration-disallow-rgba16-unorm-cube.frag,Fail
spec at nv_image_formats@compiler at declaration-disallow-rgba16-unorm-cube.vert,Fail
spec at nv_read_depth@read_depth_gles3,Fail
spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Crash
+spec at oes_point_sprite@arb_point_sprite-checkerboard_gles1,Fail
spec at oes_shader_io_blocks@compiler at layout-location-aliasing.vert,Fail
diff --git a/src/broadcom/ci/v3dv-rpi4-skips.txt b/src/broadcom/ci/v3dv-rpi4-skips.txt
index bf6a82c19bf..cc6e5b62efc 100644
--- a/src/broadcom/ci/v3dv-rpi4-skips.txt
+++ b/src/broadcom/ci/v3dv-rpi4-skips.txt
@@ -4,7 +4,6 @@ dEQP-VK.rasterization.depth_bias.d32_sfloat
# Timeout tests (> 1 minute to run)
dEQP-VK.api.object_management.max_concurrent.query_pool
-dEQP-VK.graphicsfuzz.spv-stable-maze-flatten-copy-composite
dEQP-VK.memory.mapping.dedicated_alloc.buffer.full.variable.implicit_unmap
dEQP-VK.memory.mapping.dedicated_alloc.image.full.variable.implicit_unmap
dEQP-VK.memory.mapping.suballocation.full.variable.implicit_unmap
diff --git a/src/etnaviv/ci/etnaviv-gc2000-flakes.txt b/src/etnaviv/ci/etnaviv-gc2000-flakes.txt
index cabeafa6031..6a085b30069 100644
--- a/src/etnaviv/ci/etnaviv-gc2000-flakes.txt
+++ b/src/etnaviv/ci/etnaviv-gc2000-flakes.txt
@@ -43,6 +43,7 @@ spec@!opengl 2.0 at tex3d-npot
spec@!opengl 2.1 at pbo@test_draw_pixels
spec at arb_depth_texture@depth-level-clamp
spec at arb_depth_texture@fbo-depth-gl_depth_component16-copypixels
+spec at arb_depth_texture@fbo-depth-gl_depth_component24-blit
spec at arb_es2_compatibility@texwrap formats
spec at arb_pixel_buffer_object@texsubimage pbo manual gl_texture_2d gl_rgb8 6 10 0 94 53 0
spec at arb_pixel_buffer_object@texsubimage-depth-formats pbo
@@ -51,6 +52,7 @@ spec at arb_texture_rectangle@texrect-many
spec at arb_texture_storage@texture-storage
spec at arb_texture_storage@texture-storage at 2D mipmap rendering
spec at arb_texture_storage@texture-storage at cube array texture
+spec at ext_framebuffer_object@fbo-generatemipmap-viewport
spec at ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yuyv
spec at ext_packed_depth_stencil@fbo-depth-gl_depth24_stencil8-copypixels
spec at ext_packed_depth_stencil@fbo-depth-gl_depth24_stencil8-blit
diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt
index 8a0a0e385d5..5326ebc6b29 100644
--- a/src/freedreno/ci/freedreno-a618-fails.txt
+++ b/src/freedreno/ci/freedreno-a618-fails.txt
@@ -1,8 +1,3 @@
# Fails when TU_DEBUG=forcebin is set
dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail
dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
-
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3052
-# fixed by https://gerrit.khronos.org/c/vk-gl-cts/+/7837
-bypass-dEQP-VK.renderpass.suballocation.subpass_dependencies.separate_channels.r8g8b8a8_unorm,Fail
-bypass-dEQP-VK.renderpass2.suballocation.subpass_dependencies.separate_channels.r8g8b8a8_unorm,Fail
\ No newline at end of file
diff --git a/src/freedreno/ci/freedreno-a618-skips.txt b/src/freedreno/ci/freedreno-a618-skips.txt
index 2f2f5f29db3..c0389c0a171 100644
--- a/src/freedreno/ci/freedreno-a618-skips.txt
+++ b/src/freedreno/ci/freedreno-a618-skips.txt
@@ -24,9 +24,6 @@ KHR-GLES31.core.shader_image_load_store.basic-allFormats-store-fs
# msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A618: hangcheck detected gpu lockup rb 0!
dEQP-VK.graphicsfuzz.spv-stable-maze-flatten-copy-composite
spill-dEQP-VK.graphicsfuzz.cov-nested-loop-undefined-smoothstep-never-executed
-spill-dEQP-VK.graphicsfuzz.spv-access-chains
-spill-dEQP-VK.graphicsfuzz.spv-copy-object
-spill-dEQP-VK.graphicsfuzz.spv-dead-break-and-unroll
spill-dEQP-VK.graphicsfuzz.spv-stable-maze-O-memory-accesses
spill-dEQP-VK.graphicsfuzz.spv-stable-pillars-volatile-nontemporal-store
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index 744a708d4b4..109b702da45 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -51,10 +51,6 @@ bypass-dEQP-GLES31.functional.blend_equation_advanced.msaa.softlight,Fail
dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_geom,Fail
dEQP-VK.spirv_assembly.instruction.graphics.variable_pointers.graphics.writes_two_buffers_vert,Fail
-# https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3052
-# fixed by https://gerrit.khronos.org/c/vk-gl-cts/+/7837
-bypass-dEQP-VK.renderpass.suballocation.subpass_dependencies.separate_channels.r8g8b8a8_unorm,Fail
-
glx at glx_arb_create_context_es2_profile@invalid opengl es version,Fail
glx at glx_arb_create_context_no_error@no error,Fail
glx at glx_arb_create_context_robustness@invalid reset notification strategy,Fail
diff --git a/src/freedreno/ci/freedreno-a630-skips.txt b/src/freedreno/ci/freedreno-a630-skips.txt
index d7a6dce467b..881d9909d62 100644
--- a/src/freedreno/ci/freedreno-a630-skips.txt
+++ b/src/freedreno/ci/freedreno-a630-skips.txt
@@ -25,7 +25,6 @@ KHR-GLES31.core.shader_image_load_store.basic-allFormats-store-fs
# causes a hangcheck timeout on a630:
# msm ae00000.mdss: [drm:hangcheck_handler] *ERROR* A630: hangcheck detected gpu lockup rb 0!
-dEQP-VK.graphicsfuzz.spv-stable-maze-flatten-copy-composite
spill-dEQP-VK.graphicsfuzz.spv-stable-pillars-volatile-nontemporal-store
# These take most of a minute to run
diff --git a/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt b/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt
index f56ce121a49..206c7acbc06 100644
--- a/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt
+++ b/src/gallium/drivers/radeonsi/ci/radeonsi-stoney-fails.txt
@@ -5,6 +5,7 @@ glx at glx_ext_import_context@import context- single process,Fail
glx at glx-visuals-stencil -pixmap,Crash
spec at arb_direct_state_access@gettextureimage-formats,Crash
spec at arb_es2_compatibility@texwrap formats bordercolor-swizzled,Fail
+spec at arb_program_interface_query@arb_program_interface_query-getprogramresourceindex@'vs_input2[1][0]' on GL_PROGRAM_INPUT,Fail
spec at arb_program_interface_query@arb_program_interface_query-getprogramresourceindex,Fail
spec at arb_shader_texture_lod@execution at arb_shader_texture_lod-texgradcube,Fail
spec at arb_texture_compression_bptc@texwrap formats bordercolor-swizzled,Fail
@@ -97,7 +98,10 @@ spec at khr_texture_compression_astc@miptree-gl srgb-fp,Fail
spec at khr_texture_compression_astc@miptree-gl srgb-fp at sRGB decode full precision,Fail
spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp at sRGB decode full precision,Fail
spec at khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp,Fail
+spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp at sRGB decode full precision,Fail
spec at khr_texture_compression_astc@sliced-3d-miptree-gl srgb-fp,Fail
+spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3 at oes_egl_image_external_essl3_imageLoad,Fail
+spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3 at oes_egl_image_external_essl3_imageStore,Fail
spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Fail
CreateContext/VAAPICreateContext.CreateContext/1035,Crash
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-asan-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-asan-skips.txt
index c50ec158273..0cfdf78154e 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-asan-skips.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-asan-skips.txt
@@ -2,6 +2,8 @@
dEQP-VK.texture.filtering.*.combinations.*
dEQP-VK.binding_model.buffer_device_address.set3.depth3.*
dEQP-VK.ssbo.layout.*instance_array
+dEQP-VK.ssbo.layout.random.8bit.all_per_block_buffers.6
+dEQP-VK.ssbo.layout.random.all_shared_buffer.5
dEQP-VK.tessellation.invariance.*
dEQP-VK.subgroups.ballot_broadcast.compute.subgroupbroadcast.*
dEQP-VK.ssbo.layout.3_level_unsized_array.scalar.*
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-fails.txt b/src/gallium/frontends/lavapipe/ci/lvp-fails.txt
index be2274e5d72..2cb09c2d805 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-fails.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-fails.txt
@@ -1,16 +1 @@
dEQP-VK.api.driver_properties.conformance_version,Fail
-dEQP-VK.pipeline.sampler.exact_sampling.r16g16b16a16_sfloat.solid_color.normalized_coords.edge_right,Fail
-dEQP-VK.pipeline.sampler.exact_sampling.r32g32_sfloat.solid_color.normalized_coords.centered,Fail
-dEQP-VK.pipeline.sampler.exact_sampling.r32g32_sfloat.solid_color.normalized_coords.edge_left,Fail
-dEQP-VK.pipeline.sampler.exact_sampling.r32g32_sfloat.solid_color.normalized_coords.edge_right,Fail
-dEQP-VK.rasterization.primitives.static_stipple.rectangular_line_strip_wide,Fail
-dEQP-VK.rasterization.primitives.dynamic_stipple.line_strip_wide,Fail
-dEQP-VK.rasterization.primitives.dynamic_stipple.rectangular_line_strip_wide,Fail
-dEQP-VK.rasterization.primitives.dynamic_stipple.smooth_line_strip_wide,Fail
-dEQP-VK.rasterization.primitives_multisample_4_bit.dynamic_stipple.line_strip_wide,Fail
-dEQP-VK.rasterization.primitives_multisample_4_bit.dynamic_stipple.rectangular_line_strip_wide,Fail
-dEQP-VK.rasterization.primitives_multisample_4_bit.static_stipple.line_strip_wide,Fail
-dEQP-VK.rasterization.primitives_multisample_4_bit.static_stipple.rectangular_line_strip_wide,Fail
-dEQP-VK.rasterization.primitives.static_stipple.line_strip_wide,Fail
-dEQP-VK.rasterization.primitives.static_stipple.smooth_line_strip_wide,Fail
-dEQP-VK.spirv_assembly.instruction.spirv1p4.entrypoint.comp_workgroup_entry_point,Fail
diff --git a/src/gallium/frontends/lavapipe/ci/lvp-skips.txt b/src/gallium/frontends/lavapipe/ci/lvp-skips.txt
index 41ccb37a8d9..c9d01a90edd 100644
--- a/src/gallium/frontends/lavapipe/ci/lvp-skips.txt
+++ b/src/gallium/frontends/lavapipe/ci/lvp-skips.txt
@@ -7,7 +7,6 @@ dEQP-VK.texture.filtering.3d.sizes.3x7x5.linear_mipmap_linear
# Timeouts (VK-GL-CTS 1.2.7.0)
dEQP-VK.tessellation.invariance.outer_edge_division.quads_fractional_even_spacing
-dEQP-VK.graphicsfuzz.spv-stable-maze-flatten-copy-composite
dEQP-VK.graphicsfuzz.spv-stable-pillars-O-op-select-to-op-phi
dEQP-VK.graphicsfuzz.spv-stable-pillars-volatile-nontemporal-store
dEQP-VK.graphicsfuzz.spv-composites
diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt
index 72ea29ecb35..b827025dc9a 100644
--- a/src/panfrost/ci/panfrost-g52-fails.txt
+++ b/src/panfrost/ci/panfrost-g52-fails.txt
@@ -936,6 +936,7 @@ spec at nv_copy_image@nv_copy_image-formats at Source: GL_COMPRESSED_SRGB_ALPHA_S3TC_D
spec at nv_copy_image@nv_copy_image-formats at Source: GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT/Destination: GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT,Fail
spec at nv_copy_image@nv_copy_image-formats at Source: GL_COMPRESSED_SRGB_S3TC_DXT1_EXT/Destination: GL_COMPRESSED_SRGB_S3TC_DXT1_EXT,Fail
spec at oes_egl_image_external_essl3@oes_egl_image_external_essl3,Crash
+spec at oes_point_sprite@arb_point_sprite-checkerboard_gles1,Fail
spec at oes_texture_view@sampling-2d-array-as-cubemap,Crash
spec@!opengl 1.0 at gl-1.0-edgeflag-const,Fail
spec@!opengl 1.0 at gl-1.0-edgeflag,Fail
More information about the mesa-commit
mailing list