ci: Bump LLVM/clang from 10 to 11
Preparation for moving to Debian bullseye, which has packages for LLVM 9 & 11, but not 10. Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
This commit is contained in:
parent
bc8e866b1d
commit
a3e38e0bf8
|
@ -296,7 +296,7 @@ x86_build-base:
|
|||
- .fdo.container-build@debian
|
||||
- .container
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &x86_build-base "2021-03-25-no-scons"
|
||||
MESA_IMAGE_TAG: &x86_build-base "2021-03-31-llvm11"
|
||||
|
||||
.use-x86_build-base:
|
||||
extends:
|
||||
|
@ -313,7 +313,7 @@ x86_build:
|
|||
extends:
|
||||
- .use-x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &x86_build "2021-04-08-libdrm"
|
||||
MESA_IMAGE_TAG: &x86_build "2021-04-13-llvm11"
|
||||
|
||||
.use-x86_build:
|
||||
extends:
|
||||
|
@ -397,7 +397,7 @@ android_build:
|
|||
x86_test-base:
|
||||
extends: x86_build-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &x86_test-base "2021-02-17-gfxreconstruct-master"
|
||||
MESA_IMAGE_TAG: &x86_test-base "2021-03-22-llvm11"
|
||||
|
||||
.use-x86_test-base:
|
||||
extends:
|
||||
|
@ -413,7 +413,7 @@ x86_test-base:
|
|||
x86_test-gl:
|
||||
extends: .use-x86_test-base
|
||||
variables:
|
||||
MESA_IMAGE_TAG: &x86_test-gl "2021-04-13-vkglcts-1.2.6.0"
|
||||
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-llvm11"
|
||||
|
||||
# Debian 10 based x86 test image for VK
|
||||
x86_test-vk:
|
||||
|
@ -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-13-vkglcts-1.2.6.0"
|
||||
MESA_ROOTFS_TAG: &arm-baremetal "2021-04-14-llvm11"
|
||||
MINIO_SUFFIX: "baremetal"
|
||||
|
||||
# Kernel & rootfs for armhf baremetal testing
|
||||
|
@ -621,7 +621,7 @@ sanity:
|
|||
- .use-x86_build
|
||||
stage: meson-x86_64
|
||||
variables:
|
||||
LLVM_VERSION: 10
|
||||
LLVM_VERSION: 11
|
||||
script:
|
||||
- .gitlab-ci/meson/build.sh
|
||||
|
||||
|
@ -665,7 +665,7 @@ meson-clover-testing:
|
|||
- .ci-deqp-artifacts
|
||||
variables:
|
||||
UNWIND: "enabled"
|
||||
LLVM_VERSION: 10
|
||||
LLVM_VERSION: 11
|
||||
DRI_LOADERS: >
|
||||
-D glx=disabled
|
||||
-D egl=disabled
|
||||
|
@ -873,8 +873,8 @@ meson-clang:
|
|||
DRI_DRIVERS: "auto"
|
||||
GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12"
|
||||
VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental
|
||||
CC: "ccache clang-10"
|
||||
CXX: "ccache clang++-10"
|
||||
CC: "ccache clang-11"
|
||||
CXX: "ccache clang++-11"
|
||||
|
||||
meson-windows-vs2019:
|
||||
extends:
|
||||
|
@ -972,6 +972,7 @@ meson-i386:
|
|||
- .use-i386_build
|
||||
variables:
|
||||
CROSS: i386
|
||||
LLVM_VERSION: 11
|
||||
VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental
|
||||
GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink"
|
||||
DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
set -ex
|
||||
|
||||
export LLVM_CONFIG="llvm-config-10"
|
||||
export LLVM_CONFIG="llvm-config-11"
|
||||
|
||||
$LLVM_CONFIG --version
|
||||
|
||||
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1 /SPIRV-LLVM-Translator
|
||||
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --depth 1 /SPIRV-LLVM-Translator
|
||||
pushd /SPIRV-LLVM-Translator
|
||||
cmake -S . -B . -G Ninja -DLLVM_BUILD_TOOLS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_INSTALL_PREFIX=`$LLVM_CONFIG --prefix`
|
||||
ninja
|
||||
|
|
|
@ -8,12 +8,12 @@ elif [ $DEBIAN_ARCH = amd64 ]; then
|
|||
# Upstream LLVM package repository
|
||||
apt-get -y install --no-install-recommends gnupg ca-certificates
|
||||
apt-key add /llvm-snapshot.gpg.key
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-11 main" >/etc/apt/sources.list.d/llvm11.list
|
||||
apt-get update
|
||||
|
||||
ARCH_PACKAGES="firmware-amd-graphics
|
||||
libelf1
|
||||
libllvm10
|
||||
libllvm11
|
||||
"
|
||||
fi
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ apt-get install -y \
|
|||
# Upstream LLVM package repository
|
||||
apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-11 main" >/etc/apt/sources.list.d/llvm11.list
|
||||
|
||||
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
|
||||
echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
|
||||
|
@ -31,7 +31,7 @@ apt-get install -y --no-remove \
|
|||
$STABLE_EPHEMERAL \
|
||||
bison \
|
||||
ccache \
|
||||
clang-10 \
|
||||
clang-11 \
|
||||
dpkg-cross \
|
||||
flex \
|
||||
g++ \
|
||||
|
@ -39,13 +39,14 @@ apt-get install -y --no-remove \
|
|||
gcc \
|
||||
git \
|
||||
kmod \
|
||||
libclang-10-dev \
|
||||
libclang-11-dev \
|
||||
libclang-9-dev \
|
||||
libclc-dev \
|
||||
libelf-dev \
|
||||
libepoxy-dev \
|
||||
libexpat1-dev \
|
||||
libgtk-3-dev \
|
||||
libllvm11 \
|
||||
libomxil-bellagio-dev \
|
||||
libpciaccess-dev \
|
||||
libunwind-dev \
|
||||
|
@ -62,7 +63,6 @@ apt-get install -y --no-remove \
|
|||
libxvmc-dev \
|
||||
libxxf86vm-dev \
|
||||
libz-mingw-w64-dev \
|
||||
llvm-10-dev \
|
||||
llvm-9-dev \
|
||||
pkg-config \
|
||||
python-mako \
|
||||
|
|
|
@ -28,9 +28,10 @@ apt-get install -y --no-remove \
|
|||
$STABLE_EPHEMERAL \
|
||||
libasan5 \
|
||||
libarchive-dev \
|
||||
libclang-cpp10-dev \
|
||||
libclang-cpp11-dev \
|
||||
liblua5.3-dev \
|
||||
libxml2-dev \
|
||||
llvm-11-dev \
|
||||
ocl-icd-opencl-dev \
|
||||
procps \
|
||||
strace \
|
||||
|
@ -106,7 +107,7 @@ rm -rf libglvnd-v$GLVND_VERSION
|
|||
|
||||
. .gitlab-ci/container/build-spirv-tools.sh
|
||||
|
||||
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_100 --depth 1
|
||||
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --depth 1
|
||||
pushd SPIRV-LLVM-Translator
|
||||
cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC
|
||||
ninja
|
||||
|
|
|
@ -12,7 +12,7 @@ apt-get install -y \
|
|||
# Upstream LLVM package repository
|
||||
apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" >/etc/apt/sources.list.d/llvm10.list
|
||||
echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-11 main" >/etc/apt/sources.list.d/llvm11.list
|
||||
|
||||
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
|
||||
echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
|
||||
|
@ -34,7 +34,7 @@ apt-get install -y --no-remove \
|
|||
git-lfs \
|
||||
libasan5 \
|
||||
libexpat1 \
|
||||
libllvm10 \
|
||||
libllvm11 \
|
||||
libllvm9 \
|
||||
liblz4-1 \
|
||||
libpcre32-3 \
|
||||
|
|
|
@ -10,10 +10,10 @@ STABLE_EPHEMERAL=" \
|
|||
autoconf \
|
||||
automake \
|
||||
ccache \
|
||||
clang-10 \
|
||||
clang-11 \
|
||||
cmake \
|
||||
g++ \
|
||||
libclang-cpp10-dev \
|
||||
libclang-cpp11-dev \
|
||||
libgbm-dev \
|
||||
libgles2-mesa-dev \
|
||||
libpcre3-dev \
|
||||
|
@ -24,7 +24,7 @@ STABLE_EPHEMERAL=" \
|
|||
libxcb-keysyms1-dev \
|
||||
libxkbcommon-dev \
|
||||
libxrender-dev \
|
||||
llvm-10-dev \
|
||||
llvm-11-dev \
|
||||
make \
|
||||
meson \
|
||||
ocl-icd-opencl-dev \
|
||||
|
@ -39,8 +39,8 @@ STABLE_EPHEMERAL=" \
|
|||
apt-get install -y --no-remove \
|
||||
$STABLE_EPHEMERAL \
|
||||
clinfo \
|
||||
libclang-common-10-dev \
|
||||
libclang-cpp10 \
|
||||
libclang-common-11-dev \
|
||||
libclang-cpp11 \
|
||||
libxcb-shm0 \
|
||||
ocl-icd-libopencl1 \
|
||||
python3-lxml \
|
||||
|
|
|
@ -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-13-vkglcts-1.2.6.0"
|
||||
MESA_ROOTFS_TAG: &lava-rootfs "2021-04-14-llvm11"
|
||||
MINIO_SUFFIX: "lava"
|
||||
PIGLIT_BUILD_TARGETS: "piglit_replayer"
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@ traces:
|
|||
- path: gputest/pixmark-piano.trace
|
||||
expectations:
|
||||
- device: gl-radeonsi-stoney
|
||||
checksum: 7bfbac352caf8a83a09687b2a93933e5
|
||||
checksum: 86ebe6ff8038975de8724fa9536edb7e
|
||||
- path: gputest/triangle.trace
|
||||
expectations:
|
||||
- device: gl-radeonsi-stoney
|
||||
|
|
Loading…
Reference in New Issue