From cea379549eb483e9e0d671682e4416619998c459 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Wed, 28 Apr 2021 16:16:32 +0200 Subject: [PATCH] ci: Uprev piglit to eee7d89611cf "tests: Replay profile frame times" So we can measure GPU times when replaying traces. Signed-off-by: Tomeu Vizoso Reviewed-By: Rohan Garg Part-of: --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/container/build-piglit.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb74311fb7e..d58c73e0d91 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,7 +415,7 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - MESA_IMAGE_TAG: &x86_test-gl "2021-05-19-piglit" + MESA_IMAGE_TAG: &x86_test-gl "2021-05-25-piglit" # Debian 11 based x86 test image for VK x86_test-vk: @@ -450,7 +450,7 @@ arm_build: variables: GIT_STRATEGY: fetch KERNEL_URL: "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc2-for-mesa-ci-2a4a4fa4407f/v5.13-rc2-for-mesa-ci-2a4a4fa4407f.tar.bz2" - MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-21-panfrost-oops" + MESA_ROOTFS_TAG: &kernel-rootfs "2021-05-25-piglit" 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-piglit.sh b/.gitlab-ci/container/build-piglit.sh index 2ac3287e96b..da47dd836b1 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 9d87cc3d79e0c7e572273b94dcb51882f4d83d7f +git checkout eee7d89611cf6dbafdd23f85b2f5f25ecc2d1ca3 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