Mesa (main): ci: Uprev piglit
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Dec 2 18:59:48 UTC 2021
Module: Mesa
Branch: main
Commit: cdf8a14bfff8a74a250de8fd9903d2380195fbf0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cdf8a14bfff8a74a250de8fd9903d2380195fbf0
Author: Guilherme Gallo <guilherme.gallo at collabora.com>
Date: Thu Dec 2 10:10:26 2021 -0300
ci: Uprev piglit
Bring up the piglit replay jwt-file argument feature.
Signed-off-by: Guilherme Gallo <guilherme.gallo at collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14004>
---
.gitlab-ci.yml | 22 ++++++++++++++++------
.gitlab-ci/container/build-piglit.sh | 2 +-
src/freedreno/ci/freedreno-a630-fails.txt | 6 ++++++
src/freedreno/ci/freedreno-a630-flakes.txt | 5 +++++
.../drivers/llvmpipe/ci/llvmpipe-quick_shader.txt | 1 +
src/gallium/drivers/softpipe/ci/softpipe-quick.txt | 1 +
6 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a70eb2bc085..ec12e4ea967 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -394,7 +394,7 @@ debian/android_build:
debian/x86_test-base:
extends: debian/x86_build-base
variables:
- MESA_IMAGE_TAG: &debian-x86_test-base "2021-11-25-ci-fairy"
+ MESA_IMAGE_TAG: &debian-x86_test-base "2021-12-02-piglit"
.use-debian/x86_test-base:
extends:
@@ -418,7 +418,7 @@ debian/x86_test-gl:
debian/x86_test-vk:
extends: .use-debian/x86_test-base
variables:
- MESA_IMAGE_TAG: &debian-x86_test-vk "2021-11-25-ci-fairy"
+ MESA_IMAGE_TAG: &debian-x86_test-vk "2021-12-02-piglit"
# Debian 11 based ARM build image
debian/arm_build:
@@ -467,7 +467,7 @@ fedora/x86_build:
variables:
GIT_STRATEGY: fetch
KERNEL_URL: *kernel-rootfs-url
- MESA_ROOTFS_TAG: &kernel-rootfs "2021-11-25-ci-fairy"
+ MESA_ROOTFS_TAG: &kernel-rootfs "2021-12-02-piglit"
DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
script:
- .gitlab-ci/container/lava_build.sh
@@ -556,6 +556,8 @@ debian/arm_test:
MESA_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$MESA_IMAGE_PATH:${MESA_IMAGE_TAG}"
windows_build_vs2019:
+ inherit:
+ default: false
extends:
- .container
- .windows-docker-vs2019
@@ -572,6 +574,8 @@ windows_build_vs2019:
- .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE
.use-windows_build_vs2019:
+ inherit:
+ default: false
extends: .windows-docker-vs2019
image: "$MESA_IMAGE"
needs:
@@ -596,8 +600,8 @@ make git archive:
# compress the current folder
- tar -cvzf ../$CI_PROJECT_NAME.tar.gz .
- # login with the JWT token
- - ci-fairy minio login $CI_JOB_JWT
+ # login with the JWT token file
+ - ci-fairy minio login --token-file "${CI_JOB_JWT_FILE}"
- ci-fairy minio cp ../$CI_PROJECT_NAME.tar.gz minio://$MINIO_HOST/git-cache/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/$CI_PROJECT_NAME.tar.gz
@@ -645,11 +649,13 @@ sanity:
CCACHE_DIR: /cache/mesa/ccache
# Use ccache transparently, and print stats before/after
before_script:
+ - !reference [default, before_script]
- export PATH="/usr/lib/ccache:$PATH"
- export CCACHE_BASEDIR="$PWD"
- ccache --show-stats
after_script:
- ccache --show-stats
+ - !reference [default, after_script]
.build-windows:
extends: .build-common
@@ -1147,6 +1153,7 @@ debian-mingw32-x86_64:
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
before_script:
+ - !reference [default, before_script]
# Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
- rm -rf install
- tar -xf artifacts/install.tar
@@ -1212,6 +1219,7 @@ debian-mingw32-x86_64:
- results/*.txt
variables:
PIGLIT_NO_WINDOW: 1
+ CI_JOB_JWT_FILE: /minio_jwt # JWT file on piglit jobs should be available on / partition
script:
- install/piglit/run.sh
@@ -1228,9 +1236,10 @@ debian-mingw32-x86_64:
reports:
junit: results/junit.xml
variables:
+ CI_JOB_JWT_FILE: /minio_jwt # JWT file on piglit jobs should be available on / partition
PIGLIT_PROFILES: replay
PIGLIT_REPLAY_UPLOAD_TO_MINIO: 1
- PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-public --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt=${CI_JOB_JWT}
+ PIGLIT_REPLAY_EXTRA_ARGS: --keep-image --db-path ${CI_PROJECT_DIR}/replayer-db/ --minio_host=minio-packet.freedesktop.org --minio_bucket=mesa-tracie-public --role-session-name=${CI_PROJECT_PATH}:${CI_JOB_ID} --jwt-file=${CI_JOB_JWT_FILE}
PIGLIT_JUNIT_RESULTS: 1
.deqp-test:
@@ -1296,6 +1305,7 @@ debian-mingw32-x86_64:
interruptible: true
stage: test
before_script:
+ - !reference [default, before_script]
# Use this instead of gitlab's artifacts download because it hits packet.net
# instead of fd.o. Set FDO_HTTP_CACHE_URI to an http cache for your test lab to
# improve it even more (see https://docs.mesa3d.org/ci/bare-metal.html for
diff --git a/.gitlab-ci/container/build-piglit.sh b/.gitlab-ci/container/build-piglit.sh
index 680f1f87e61..d68e675abc7 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 83bc56abf2686e2cd9024a152e121ca4aa524985
+git checkout 00b82804aaa4b27fe7fd134e784a23a2d358ebe1
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/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index d1ac6750e2a..6263bf76ef8 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -143,6 +143,12 @@ spec at arb_sample_shading@samplemask 4,Fail
spec at arb_sample_shading@samplemask 4 at noms mask_in_one,Fail
spec at arb_sample_shading@samplemask 4 at sample mask_in_one,Fail
+# These 3 fails started to happen after piglit uprev with commit
+# 0ef03f824d1833a853d1a20b4be121089bb9246c
+spec at arb_shader_image_load_store@qualifiers,Fail
+spec at arb_shader_image_load_store@qualifiers at r8/permissive layout qualifiers/permissive access qualifiers/permissive binding test,Fail
+spec at arb_shader_image_load_store@qualifiers at r8/strict layout qualifiers/permissive access qualifiers/permissive binding test,Fail
+
spec at arb_shader_storage_buffer_object@array-ssbo-auto-binding,Fail
spec at arb_shader_storage_buffer_object@linker at instance-matching-shader-storage-blocks-member-array-size-mismatch,Fail
spec at arb_tessellation_shader@execution at gs-primitiveid-instanced,Fail
diff --git a/src/freedreno/ci/freedreno-a630-flakes.txt b/src/freedreno/ci/freedreno-a630-flakes.txt
index d8beb977612..452066519c2 100644
--- a/src/freedreno/ci/freedreno-a630-flakes.txt
+++ b/src/freedreno/ci/freedreno-a630-flakes.txt
@@ -141,6 +141,11 @@ spec at arb_draw_indirect@arb_draw_indirect-transform-feedback
# Flaky since around 2021-03-22. First appeared on an innocent mingw branch.
spec at arb_depth_texture@fbo-clear-formats
+# Flaky since 2021-12-02, during piglit uprev with commit
+# 0ef03f824d1833a853d1a20b4be121089bb9246c
+spec at arb_draw_indirect@arb_draw_indirect-transform-feedback
+spec at arb_map_buffer_range@map_invalidate_buffer_bit offset=0
+
# Occasionally passes instead of failing
spec at egl_chromium_sync_control@conformance
spec at egl_chromium_sync_control@conformance at eglGetSyncValuesCHROMIUM_msc_and_sbc_test
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
index da9821b0d32..96a0360209f 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
@@ -18,6 +18,7 @@ spec/arb_bindless_texture/execution/samplers/fs-struct-non-const-index: skip
spec/arb_bindless_texture/execution/samplers/sampler-in-struct: skip
spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output: skip
spec/arb_bindless_texture/execution/samplers/sampler-vertex-uniform-input-output: skip
+spec/arb_bindless_texture/execution/samplers/ubo-binding-samplers-conflict: skip
spec/arb_bindless_texture/execution/samplers/ubo-named-block: skip
spec/arb_bindless_texture/linker/global_bindless_image_and_bound_image: skip
spec/arb_bindless_texture/linker/global_bindless_image_and_bound_sampler: skip
diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
index e860e667c32..03209b8ece3 100644
--- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
@@ -510,6 +510,7 @@ spec/arb_bindless_texture/execution/samplers/fs-struct-non-const-index: skip
spec/arb_bindless_texture/execution/samplers/sampler-in-struct: skip
spec/arb_bindless_texture/execution/samplers/sampler-vertex-attrib-input-output: skip
spec/arb_bindless_texture/execution/samplers/sampler-vertex-uniform-input-output: skip
+spec/arb_bindless_texture/execution/samplers/ubo-binding-samplers-conflict: skip
spec/arb_bindless_texture/execution/samplers/ubo-named-block: skip
spec/arb_bindless_texture/handles: skip
spec/arb_bindless_texture/illegal: skip
More information about the mesa-commit
mailing list