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>

7 files changed, 19 insertions, 18 deletions

diff --git a/.gitlab-ci/container/build-libclc.sh b/.gitlab-ci/container/build-libclc.sh
index 7867d5833af..596a4c88bcf 100644
--- a/.gitlab-ci/container/build-libclc.sh
+++ b/.gitlab-ci/container/build-libclc.sh
@@ -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
diff --git a/.gitlab-ci/container/create-rootfs.sh b/.gitlab-ci/container/create-rootfs.sh
index fb09c376d48..ab4fc33795e 100644
--- a/.gitlab-ci/container/create-rootfs.sh
+++ b/.gitlab-ci/container/create-rootfs.sh
@@ -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
 
diff --git a/.gitlab-ci/container/x86_build-base.sh b/.gitlab-ci/container/x86_build-base.sh
index 0e51acc2d62..61017cde904 100644
--- a/.gitlab-ci/container/x86_build-base.sh
+++ b/.gitlab-ci/container/x86_build-base.sh
@@ -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 \
diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index 75036768d8e..462a974698f 100644
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -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
diff --git a/.gitlab-ci/container/x86_test-base.sh b/.gitlab-ci/container/x86_test-base.sh
index fbcdcbd4e54..c1e2e467f4d 100644
--- a/.gitlab-ci/container/x86_test-base.sh
+++ b/.gitlab-ci/container/x86_test-base.sh
@@ -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 \
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index 490a6fc994a..fa53f910626 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -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 \
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index f0f03d2e70a..aa9573f4f59 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -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"