KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: Install librenderdoc from Debian bullseye 

Debian bullseye has a separate command-line-only renderdoc package, so
no need to install Qt packages and build renderdoc anymore.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3125
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
This commit is contained in:
Michel Dänzer 2021-03-20 11:00:05 +01:00 committed by Marge Bot
parent af0fde955c
commit c743421f4e
9 changed files with 10 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -397,7 +397,7 @@ android_build:
x86_test-base:
extends: x86_build-base
variables:
MESA_IMAGE_TAG: &x86_test-base "2021-03-22-bullseye"
MESA_IMAGE_TAG: &x86_test-base "2021-03-31-librenderdoc"
.use-x86_test-base:
extends:
@ -413,13 +413,13 @@ x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-bullseye"
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-librenderdoc"
# Debian 11 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-bullseye"
MESA_IMAGE_TAG: &x86_test-vk "2021-04-14-librenderdoc"
# Debian 11 based ARM build image
arm_build:
@ -448,7 +448,7 @@ kernel+rootfs_arm64-baremetal:
variables:
DEBIAN_ARCH: "arm64"
KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-04-01-5.11.tar.gz"
MESA_ROOTFS_TAG: &arm-baremetal "2021-04-14-bullseye"
MESA_ROOTFS_TAG: &arm-baremetal "2021-04-14-librenderdoc"
MINIO_SUFFIX: "baremetal"
# Kernel & rootfs for armhf baremetal testing
@ -474,7 +474,7 @@ arm_test:
FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=baremetal/${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: *arm_build
MESA_IMAGE_TAG: &arm_test "2021-04-14-bullseye"
MESA_IMAGE_TAG: &arm_test "2021-04-14-librenderdoc"
MESA_ROOTFS_TAG: *arm-baremetal
.use-arm_test:

17
.gitlab-ci/container/build-renderdoc.sh
View File

@ -1,17 +0,0 @@
#!/bin/bash
set -ex
RENDERDOC_VERSION=da02e88201dc3b64316fc33ce6ff69cc729689aa
git clone https://github.com/baldurk/renderdoc.git --single-branch --no-checkout /renderdoc
pushd /renderdoc
git checkout "$RENDERDOC_VERSION"
cmake -S . -B _build -G Ninja -DENABLE_QRENDERDOC=false -DCMAKE_BUILD_TYPE=Release $EXTRA_CMAKE_ARGS
ninja -C _build
mkdir -p build/lib
${STRIP_CMD:-strip} _build/lib/*.so
cp _build/lib/renderdoc.so build/lib
cp _build/lib/librenderdoc.so build/lib
find . -not -path './build' -not -path './build/*' -delete
popd

1
.gitlab-ci/container/container_pre_build.sh
View File

@ -8,7 +8,6 @@ export CCACHE_DIR=/cache/mesa/ccache
export PATH=/usr/lib/ccache:$PATH
# CMake ignores $PATH, so we have to force CC/GCC to the ccache versions.
# Watch out, you can't have spaces in here because the renderdoc build fails.
export CC="/usr/lib/ccache/gcc"
export CXX="/usr/lib/ccache/g++"

1
.gitlab-ci/container/create-rootfs.sh
View File

@ -57,6 +57,7 @@ apt-get -y install --no-install-recommends \
python3-numpy \
python3-packaging \
python3-pil \
python3-renderdoc \
python3-requests \
python3-simplejson \
python3-yaml \

22
.gitlab-ci/container/lava_build.sh
View File

@ -73,48 +73,36 @@ apt-get install -y --no-remove \
cmake \
debootstrap \
git \
libboost-dev \
libegl1-mesa-dev \
libgbm-dev \
libgles2-mesa-dev \
libpcre3-dev \
libpython3-dev \
libssl-dev \
libudev-dev \
libvulkan-dev \
libwaffle-dev \
libwayland-dev \
libx11-xcb-dev \
libxcb-keysyms1-dev \
libxkbcommon-dev \
patch \
python3-dev \
python3-distutils \
python3-mako \
python3-numpy \
python3-serial \
qt5-qmake \
qtbase5-dev \
wget
if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
apt-get install -y --no-remove \
libboost-dev:armhf \
libegl1-mesa-dev:armhf \
libelf-dev:armhf \
libgbm-dev:armhf \
libgles2-mesa-dev:armhf \
libpcre3-dev:armhf \
libpython3-dev:armhf \
libudev-dev:armhf \
libvulkan-dev:armhf \
libwaffle-dev:armhf \
libwayland-dev:armhf \
libx11-xcb-dev:armhf \
libxcb-keysyms1-dev:armhf \
libxkbcommon-dev:armhf \
qtbase5-dev:armhf
libxkbcommon-dev:armhf
fi
@ -141,14 +129,6 @@ mv /deqp /lava-files/rootfs-${DEBIAN_ARCH}/.
mv /piglit /lava-files/rootfs-${DEBIAN_ARCH}/.
############### Build renderdoc
EXTRA_CMAKE_ARGS+=" -DENABLE_XCB=false"
. .gitlab-ci/container/build-renderdoc.sh
mkdir -p /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
mv /renderdoc/build /lava-files/rootfs-${DEBIAN_ARCH}/renderdoc
rm -rf /renderdoc
############### Build libdrm
EXTRA_MESON_ARGS+=" -D prefix=/libdrm"
. .gitlab-ci/container/build-libdrm.sh

4
.gitlab-ci/container/x86_test-base.sh
View File

@ -29,14 +29,12 @@ apt-get install -y --no-remove \
libllvm11 \
libllvm9 \
liblz4-1 \
libpcre32-3 \
libpng16-16 \
libpython3.9 \
libvulkan1 \
libwayland-client0 \
libwayland-server0 \
libxcb-ewmh2 \
libxcb-keysyms1 \
libxcb-randr0 \
libxcb-xfixes0 \
libxkbcommon0 \
@ -50,8 +48,6 @@ apt-get install -y --no-remove \
python3-requests \
python3-six \
python3-yaml \
qtbase5-dev \
qt5-qmake \
vulkan-tools \
waffle-utils \
xauth \

8
.gitlab-ci/container/x86_test-gl.sh
View File

@ -16,14 +16,12 @@ STABLE_EPHEMERAL=" \
libclang-cpp11-dev \
libgbm-dev \
libgles2-mesa-dev \
libpcre3-dev \
libpciaccess-dev \
libudev-dev \
libvulkan-dev \
libwaffle-dev \
libwayland-dev \
libx11-xcb-dev \
libxcb-keysyms1-dev \
libxkbcommon-dev \
libxrender-dev \
llvm-11-dev \
@ -33,7 +31,6 @@ STABLE_EPHEMERAL=" \
patch \
pkg-config \
python3-distutils \
python3-dev \
wget \
xz-utils \
"
@ -44,9 +41,11 @@ apt-get install -y --no-remove \
clinfo \
libclang-common-11-dev \
libclang-cpp11 \
libegl1 \
libxcb-shm0 \
ocl-icd-libopencl1 \
python3-lxml \
python3-renderdoc \
python3-simplejson
@ -82,9 +81,6 @@ rm -rf /root/.rustup /root/.cargo
DEQP_TARGET=surfaceless . .gitlab-ci/container/build-deqp.sh
############### Build renderdoc
. .gitlab-ci/container/build-renderdoc.sh
############### Uninstall the build software

2
.gitlab-ci/lava-gitlab-ci.yml
View File

@ -14,7 +14,7 @@
variables:
KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
INSTALL_KERNEL_MODULES: 1
MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-bullseye"
MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-librenderdoc"
MINIO_SUFFIX: "lava"
PIGLIT_BUILD_TARGETS: "piglit_replayer"

4
.gitlab-ci/piglit/run.sh
View File

@ -57,10 +57,6 @@ else
### GL/ES ###
if [ "x$PIGLIT_PROFILES" = "xreplay" ]; then
# Set environment for renderdoc libraries.
export PYTHONPATH="$PYTHONPATH:/renderdoc/build/lib"
export __LD_LIBRARY_PATH="$__LD_LIBRARY_PATH:/renderdoc/build/lib"
# Set environment for apitrace executable.
export PATH="/apitrace/build:$PATH"