ci: Install llvm-spirv from Debian bullseye
While we're at it, use a tag instead of whatever happens to be the current main branch for building libclc. Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
This commit is contained in:
parent
711b89454b
commit
0155881d82
|
@ -313,7 +313,7 @@ x86_build:
|
||||||
extends:
|
extends:
|
||||||
- .use-x86_build-base
|
- .use-x86_build-base
|
||||||
variables:
|
variables:
|
||||||
MESA_IMAGE_TAG: &x86_build "2021-04-13-spirv-tools"
|
MESA_IMAGE_TAG: &x86_build "2021-04-13-llvm-spirv"
|
||||||
|
|
||||||
.use-x86_build:
|
.use-x86_build:
|
||||||
extends:
|
extends:
|
||||||
|
@ -413,7 +413,7 @@ x86_test-base:
|
||||||
x86_test-gl:
|
x86_test-gl:
|
||||||
extends: .use-x86_test-base
|
extends: .use-x86_test-base
|
||||||
variables:
|
variables:
|
||||||
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-spirv-tools"
|
MESA_IMAGE_TAG: &x86_test-gl "2021-04-14-llvm-spirv"
|
||||||
|
|
||||||
# Debian 11 based x86 test image for VK
|
# Debian 11 based x86 test image for VK
|
||||||
x86_test-vk:
|
x86_test-vk:
|
||||||
|
|
|
@ -6,26 +6,17 @@ export LLVM_CONFIG="llvm-config-11"
|
||||||
|
|
||||||
$LLVM_CONFIG --version
|
$LLVM_CONFIG --version
|
||||||
|
|
||||||
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --single-branch --shallow-since=2020-11-12 /SPIRV-LLVM-Translator
|
|
||||||
pushd /SPIRV-LLVM-Translator
|
|
||||||
# Last commit before bumping required LLVM version to 11.1.0
|
|
||||||
git checkout 93032d36d2fe17befb7994714c07c67ea68efbea
|
|
||||||
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
|
|
||||||
ninja install
|
|
||||||
popd
|
|
||||||
|
|
||||||
|
|
||||||
git config --global user.email "mesa@example.com"
|
git config --global user.email "mesa@example.com"
|
||||||
git config --global user.name "Mesa CI"
|
git config --global user.name "Mesa CI"
|
||||||
git clone \
|
git clone \
|
||||||
https://github.com/llvm/llvm-project \
|
https://github.com/llvm/llvm-project \
|
||||||
--depth 1 \
|
--depth 1 \
|
||||||
|
-b llvmorg-12.0.0-rc3 \
|
||||||
/llvm-project
|
/llvm-project
|
||||||
|
|
||||||
mkdir /libclc
|
mkdir /libclc
|
||||||
pushd /libclc
|
pushd /libclc
|
||||||
cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG=$LLVM_CONFIG -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
|
cmake -S /llvm-project/libclc -B . -G Ninja -DLLVM_CONFIG=$LLVM_CONFIG -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLLVM_SPIRV=/usr/bin/llvm-spirv
|
||||||
ninja
|
ninja
|
||||||
ninja install
|
ninja install
|
||||||
popd
|
popd
|
||||||
|
@ -36,4 +27,4 @@ ln -s /usr/share/clc/spirv64-mesa3d-.spv /usr/lib/clc/
|
||||||
ln -s /usr/share/clc/spirv-mesa3d-.spv /usr/lib/clc/
|
ln -s /usr/share/clc/spirv-mesa3d-.spv /usr/lib/clc/
|
||||||
|
|
||||||
du -sh *
|
du -sh *
|
||||||
rm -rf /libclc /llvm-project /SPIRV-LLVM-Translator
|
rm -rf /libclc /llvm-project
|
||||||
|
|
|
@ -27,6 +27,7 @@ apt-get install -y --no-remove \
|
||||||
libasan6 \
|
libasan6 \
|
||||||
libarchive-dev \
|
libarchive-dev \
|
||||||
libclang-cpp11-dev \
|
libclang-cpp11-dev \
|
||||||
|
libllvmspirvlib-dev \
|
||||||
liblua5.3-dev \
|
liblua5.3-dev \
|
||||||
libxcb-dri2-0-dev \
|
libxcb-dri2-0-dev \
|
||||||
libxcb-dri3-dev \
|
libxcb-dri3-dev \
|
||||||
|
@ -93,15 +94,6 @@ pushd libglvnd-v$GLVND_VERSION; ./autogen.sh; ./configure; make install; popd
|
||||||
rm -rf libglvnd-v$GLVND_VERSION
|
rm -rf libglvnd-v$GLVND_VERSION
|
||||||
|
|
||||||
|
|
||||||
git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator -b llvm_release_110 --single-branch --shallow-since=2020-11-12
|
|
||||||
pushd SPIRV-LLVM-Translator
|
|
||||||
# Last commit before bumping required LLVM version to 11.1.0
|
|
||||||
git checkout 93032d36d2fe17befb7994714c07c67ea68efbea
|
|
||||||
cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC
|
|
||||||
ninja
|
|
||||||
ninja install
|
|
||||||
popd
|
|
||||||
|
|
||||||
pushd /usr/local
|
pushd /usr/local
|
||||||
git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
|
git clone https://gitlab.freedesktop.org/mesa/shader-db.git --depth 1
|
||||||
rm -rf shader-db/.git
|
rm -rf shader-db/.git
|
||||||
|
|
|
@ -16,6 +16,7 @@ STABLE_EPHEMERAL=" \
|
||||||
libclang-cpp11-dev \
|
libclang-cpp11-dev \
|
||||||
libgbm-dev \
|
libgbm-dev \
|
||||||
libgles2-mesa-dev \
|
libgles2-mesa-dev \
|
||||||
|
libllvmspirvlib-dev \
|
||||||
libpciaccess-dev \
|
libpciaccess-dev \
|
||||||
libudev-dev \
|
libudev-dev \
|
||||||
libvulkan-dev \
|
libvulkan-dev \
|
||||||
|
@ -25,6 +26,7 @@ STABLE_EPHEMERAL=" \
|
||||||
libxkbcommon-dev \
|
libxkbcommon-dev \
|
||||||
libxrender-dev \
|
libxrender-dev \
|
||||||
llvm-11-dev \
|
llvm-11-dev \
|
||||||
|
llvm-spirv \
|
||||||
make \
|
make \
|
||||||
meson \
|
meson \
|
||||||
ocl-icd-opencl-dev \
|
ocl-icd-opencl-dev \
|
||||||
|
@ -42,6 +44,7 @@ apt-get install -y --no-remove \
|
||||||
libclang-common-11-dev \
|
libclang-common-11-dev \
|
||||||
libclang-cpp11 \
|
libclang-cpp11 \
|
||||||
libegl1 \
|
libegl1 \
|
||||||
|
libllvmspirvlib11 \
|
||||||
libxcb-shm0 \
|
libxcb-shm0 \
|
||||||
ocl-icd-libopencl1 \
|
ocl-icd-libopencl1 \
|
||||||
python3-lxml \
|
python3-lxml \
|
||||||
|
|
Loading…
Reference in New Issue