From d324748e92af2c596b71c7051e9c0c879fe9f525 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 1 Sep 2021 16:08:10 +0200 Subject: [PATCH] ci: Uprev piglit to 99be1b06ff36 Brings in these changes: 99be1b06ff36 framework/replay: Display the image differences if any 3074b9c72b3d glsl-predication-on-large-array: Test predication on values from large array c97da22d35b4 cmake: Fix gbm test compiling 0cbccd68c3c1 piglit: Find our data directory when we're invoked through a symlink 4eb71fc10bbe arb_sso: add test that has explicit locations and array fields in ifc fa9c82380273 glsl-1.30: test shadow var in a switch aa7f042b0417 glsl-1.30: add tests for incorrect "compare to 0" optimizations 60138ef32ec1 add explicit tests for GetFragDataLocation/Index(gl_Frag*) 4a8806696b90 egl: add test for EGL_KHR_display_reference d6b7053b4e52 glsl-1.30: test that switch expression is evaluated once 8023a3c945c3 arb_shader_storage_buffer_object: Require extension on the new test 8820cac60827 pbobench: Fix sometimes-uninitialized warning. Signed-off-by: Tomeu Vizoso Reviewed-by: Daniel Stone Part-of: --- .gitlab-ci.yml | 8 ++++---- .gitlab-ci/container/build-piglit.sh | 2 +- src/broadcom/ci/piglit-vc4-rpi3-fails.txt | 1 + src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt | 1 + src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt | 2 ++ src/gallium/drivers/softpipe/ci/softpipe-quick.txt | 1 + 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd884fe..5c9aae2 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.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2" - MESA_IMAGE_TAG: &debian-x86_test-gl "2021-08-04-latest-virglrenderer" + MESA_IMAGE_TAG: &debian-x86_test-gl "2021-09-01-piglit" # 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-07-30-piglit-2" + MESA_IMAGE_TAG: &debian-x86_test-vk "2021-09-01-piglit" # 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-08-07-enable-lima" + MESA_ROOTFS_TAG: &kernel-rootfs "2021-09-01-piglit" DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}" script: - .gitlab-ci/container/lava_build.sh @@ -520,7 +520,7 @@ debian/arm_test: FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}" MESA_ARM_BUILD_TAG: *debian-arm_build - MESA_IMAGE_TAG: &debian-arm_test "2021-07-26-python" + MESA_IMAGE_TAG: &debian-arm_test "2021-09-01-piglit" MESA_ROOTFS_TAG: *kernel-rootfs .use-debian/arm_test: diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 99d6734..4a97aa4 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 4545a28cd8fea03fbab0e5f90bfbd812c32f3be1 +git checkout 99be1b06ff360edc17e9117bd82189dbade42013 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/piglit-vc4-rpi3-fails.txt b/src/broadcom/ci/piglit-vc4-rpi3-fails.txt index edd6989..cb9dfaa 100644 --- a/src/broadcom/ci/piglit-vc4-rpi3-fails.txt +++ b/src/broadcom/ci/piglit-vc4-rpi3-fails.txt @@ -22,6 +22,7 @@ glx@glx_ext_import_context@query context info,Fail shaders@glsl-arb-fragment-coord-conventions,Fail shaders@glsl-bug-110796,Fail shaders@glsl-max-vertex-attrib,Fail +shaders@glsl-predication-on-large-array,Fail spec@!opengl 1.0@gl-1.0-bitmap-heart-dance,Fail spec@!opengl 1.0@gl-1.0-dlist-bitmap,Crash spec@!opengl 1.0@gl-1.0-drawbuffer-modes,Fail diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt index 31d0bd7..314743f 100644 --- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt +++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt @@ -19,6 +19,7 @@ glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail shaders@glsl-bug-110796,Fail +shaders@glsl-predication-on-large-array,Fail shaders@point-vertex-id divisor,Crash shaders@point-vertex-id gl_instanceid,Crash shaders@point-vertex-id gl_instanceid divisor,Crash diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt index 90381f8..0d1abda 100644 --- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt @@ -29,6 +29,8 @@ shaders@glsl-uniform-interstage-limits@520 vs- 1 fs,Fail shaders@glsl-uniform-interstage-limits@subdivide 5,Fail shaders@glsl-uniform-interstage-limits@subdivide 5- statechanges,Fail +shaders@glsl-predication-on-large-array,Fail + shaders@ssa@fs-if-def-else-break,Fail shaders@ssa@fs-lost-copy-problem,Fail shaders@ssa@fs-swap-problem,Fail diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt index 3ca3074..d2a9bb2 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt @@ -843,6 +843,7 @@ spec/arb_sample_shading/samplemask 6: skip spec/arb_sample_shading/samplemask 6 all: skip spec/arb_sample_shading/samplemask 8: skip spec/arb_sample_shading/samplemask 8 all: skip +spec/arb_separate_shader_objects/execution/layout-location-named-block-with-array: skip spec/arb_separate_shader_objects/linker/pervertex-clipdistance-tcs-out-tes: skip spec/arb_separate_shader_objects/linker/pervertex-clipdistance-tes-out-gs: skip spec/arb_separate_shader_objects/linker/pervertex-clipdistance-vs-out-tcs: skip -- 2.7.4