ci: build our own version of the LLVM SPIRV translator

Debian stable and Fedora do not package the required version for
intel-clc.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18788>
This commit is contained in:
Lionel Landwerlin
2022-09-22 18:56:45 +03:00
committed by Marge Bot
parent 05b1f3fd97
commit 78b1e0340e
5 changed files with 32 additions and 7 deletions

View File

@@ -0,0 +1,19 @@
#!/bin/bash
set -ex
wget https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v13.0.0.tar.gz
tar -xvf v13.0.0.tar.gz && rm v13.0.0.tar.gz
mkdir SPIRV-LLVM-Translator-13.0.0/build
pushd SPIRV-LLVM-Translator-13.0.0/build
cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
ninja
ninja install
# For some reason llvm-spirv is not installed by default
ninja llvm-spirv
cp tools/llvm-spirv/llvm-spirv /usr/bin/
popd
du -sh SPIRV-LLVM-Translator-13.0.0
rm -rf SPIRV-LLVM-Translator-13.0.0

View File

@@ -29,7 +29,6 @@ apt-get install -y --no-remove \
libclang-cpp11-dev \ libclang-cpp11-dev \
libgbm-dev \ libgbm-dev \
libglvnd-dev \ libglvnd-dev \
libllvmspirvlib-dev \
liblua5.3-dev \ liblua5.3-dev \
libxcb-dri2-0-dev \ libxcb-dri2-0-dev \
libxcb-dri3-dev \ libxcb-dri3-dev \
@@ -69,6 +68,8 @@ tar -xvf $XORGMACROS_VERSION.tar.bz2 && rm $XORGMACROS_VERSION.tar.bz2
cd $XORGMACROS_VERSION; ./configure; make install; cd .. cd $XORGMACROS_VERSION; ./configure; make install; cd ..
rm -rf $XORGMACROS_VERSION rm -rf $XORGMACROS_VERSION
. .gitlab-ci/container/build-llvm-spirv.sh
. .gitlab-ci/container/build-libdrm.sh . .gitlab-ci/container/build-libdrm.sh
. .gitlab-ci/container/build-wayland.sh . .gitlab-ci/container/build-wayland.sh

View File

@@ -19,6 +19,7 @@ STABLE_EPHEMERAL=" \
bison \ bison \
bzip2 \ bzip2 \
ccache \ ccache \
cmake \
clang-11 \ clang-11 \
flex \ flex \
glslang-tools \ glslang-tools \
@@ -35,6 +36,8 @@ STABLE_EPHEMERAL=" \
libwayland-dev \ libwayland-dev \
libx11-xcb-dev \ libx11-xcb-dev \
libxext-dev \ libxext-dev \
llvm-13-dev \
llvm-11-dev \
make \ make \
meson \ meson \
patch \ patch \
@@ -43,6 +46,7 @@ STABLE_EPHEMERAL=" \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-wheel \ python3-wheel \
spirv-tools \
wayland-protocols \ wayland-protocols \
xz-utils \ xz-utils \
" "
@@ -118,6 +122,10 @@ pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@34f4ade9
# Needed for manipulation with traces yaml files. # Needed for manipulation with traces yaml files.
pip3 install yq pip3 install yq
############### Build LLVM-SPIRV translator
. .gitlab-ci/container/build-llvm-spirv.sh
############### Build libdrm ############### Build libdrm
. .gitlab-ci/container/build-libdrm.sh . .gitlab-ci/container/build-libdrm.sh

View File

@@ -20,7 +20,6 @@ STABLE_EPHEMERAL=" \
libclang-cpp13-dev \ libclang-cpp13-dev \
libclang-cpp11-dev \ libclang-cpp11-dev \
libgles2-mesa-dev \ libgles2-mesa-dev \
libllvmspirvlib-dev \
libpciaccess-dev \ libpciaccess-dev \
libpng-dev \ libpng-dev \
libudev-dev \ libudev-dev \
@@ -32,7 +31,6 @@ STABLE_EPHEMERAL=" \
libxrender-dev \ libxrender-dev \
llvm-13-dev \ llvm-13-dev \
llvm-11-dev \ llvm-11-dev \
llvm-spirv \
make \ make \
meson \ meson \
ocl-icd-opencl-dev \ ocl-icd-opencl-dev \
@@ -56,7 +54,6 @@ apt-get install -y --no-remove \
libegl1 \ libegl1 \
libepoxy0 \ libepoxy0 \
libfdt1 \ libfdt1 \
libllvmspirvlib11 \
libxcb-shm0 \ libxcb-shm0 \
ocl-icd-libopencl1 \ ocl-icd-libopencl1 \
python3-lxml \ python3-lxml \

View File

@@ -1,9 +1,9 @@
variables: variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_BASE_TAG: "2022-09-22-python3-ply-2" DEBIAN_BASE_TAG: "2022-09-22-llvm-spirv"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2022-09-22-python3-ply-2" DEBIAN_BUILD_TAG: "2022-09-22-llvm-spirv"
DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw" DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck" DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck"
@@ -11,7 +11,7 @@ variables:
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
DEBIAN_X86_TEST_GL_TAG: "2022-09-14-add-jq" DEBIAN_X86_TEST_GL_TAG: "2022-09-22-llvm-spirv"
DEBIAN_X86_TEST_VK_TAG: "2022-09-14-add-jq" DEBIAN_X86_TEST_VK_TAG: "2022-09-14-add-jq"
FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2"