mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-23 18:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

swr: bump minimum supported LLVM version to 4.0

Browse Source 
Since radv and radeonsi removed support for LLVM 3.9 the distcheck
target got broken because SWR distribution needed 3.9.x.

After checking with George Kyriazis, SWR is OK with moving to LLVM 4.0
and above, which will solve this problem.

Fixes: 3bf1e036e8 ("amd: remove support for LLVM 3.9")
Cc: George Kyriazis <george.kyriazis@intel.com>
Cc: Tim Rowley <timothy.o.rowley@intel.com>
Cc: Emil Velikov <emil.velikov@collabora.com>
Cc: Dylan Baker <dylan@pnwbakers.com>
Cc: Eric Engestrom <eric.engestrom@imgtec.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Reviewed-by: George Kyriazis <george.kyriazis@intel.com>
This commit is contained in:
Andres Gomez 2018-02-14 00:42:57 +02:00
parent b39f6d5fc7
commit 36ac485bd1
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@ -90,12 +90,10 @@ matrix:
- BUILD=make - BUILD=make
- MAKEFLAGS="-j4" - MAKEFLAGS="-j4"
- MAKE_CHECK_COMMAND="true" - MAKE_CHECK_COMMAND="true"
- LLVM_VERSION=3.9 - LLVM_VERSION=4.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- OVERRIDE_CC="gcc-4.8" - OVERRIDE_CC="gcc-4.8"
- OVERRIDE_CXX="g++-4.8" - OVERRIDE_CXX="g++-4.8"
# New binutils linker is required for llvm-3.9
- OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
- DRI_DRIVERS="" - DRI_DRIVERS=""
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
@ -105,13 +103,12 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-3.9 - llvm-toolchain-trusty-4.0
packages: packages:
- binutils-2.26
# LLVM packaging is broken and misses these dependencies # LLVM packaging is broken and misses these dependencies
- libedit-dev - libedit-dev
# From sources above # From sources above
- llvm-3.9-dev - llvm-4.0-dev
# Common # Common
- xz-utils - xz-utils
- x11proto-xf86vidmode-dev - x11proto-xf86vidmode-dev
@ -400,7 +397,7 @@ matrix:
- BUILD=scons - BUILD=scons
- SCONSFLAGS="-j4" - SCONSFLAGS="-j4"
- SCONS_TARGET="swr=1" - SCONS_TARGET="swr=1"
- LLVM_VERSION=3.9 - LLVM_VERSION=4.0
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
# Keep it symmetrical to the make build. There's no actual SWR, yet. # Keep it symmetrical to the make build. There's no actual SWR, yet.
- SCONS_CHECK_COMMAND="true" - SCONS_CHECK_COMMAND="true"
@ -409,13 +406,13 @@ matrix:
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-3.9 - llvm-toolchain-trusty-4.0
packages: packages:
- scons - scons
# LLVM packaging is broken and misses these dependencies # LLVM packaging is broken and misses these dependencies
- libedit-dev - libedit-dev
# From sources above # From sources above
- llvm-3.9-dev - llvm-4.0-dev
# Common # Common
- xz-utils - xz-utils
- x11proto-xf86vidmode-dev - x11proto-xf86vidmode-dev

6
configure.ac
View File

@ -105,7 +105,7 @@ LLVM_REQUIRED_OPENCL=3.9.0
LLVM_REQUIRED_R600=3.9.0 LLVM_REQUIRED_R600=3.9.0
LLVM_REQUIRED_RADEONSI=4.0.0 LLVM_REQUIRED_RADEONSI=4.0.0
LLVM_REQUIRED_RADV=4.0.0 LLVM_REQUIRED_RADV=4.0.0
LLVM_REQUIRED_SWR=3.9.0 LLVM_REQUIRED_SWR=4.0.0
dnl Check for progs dnl Check for progs
AC_PROG_CPP AC_PROG_CPP
@ -2695,8 +2695,8 @@ if test -n "$with_gallium_drivers"; then
fi fi
# XXX: Keep in sync with LLVM_REQUIRED_SWR # XXX: Keep in sync with LLVM_REQUIRED_SWR
AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x3.9.0 -a \ AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x4.0.0 -a \
"x$LLVM_VERSION" != x3.9.1) "x$LLVM_VERSION" != x4.0.1)
if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then
llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium" llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"

4
meson.build
View File

@ -1011,9 +1011,9 @@ if with_gallium_opencl
# TODO: optional modules # TODO: optional modules
endif endif
if with_amd_vk or with_gallium_radeonsi if with_amd_vk or with_gallium_radeonsi or with_gallium_swr
_llvm_version = '>= 4.0.0' _llvm_version = '>= 4.0.0'
elif with_gallium_opencl or with_gallium_swr or with_gallium_r600 elif with_gallium_opencl or with_gallium_r600
_llvm_version = '>= 3.9.0' _llvm_version = '>= 3.9.0'
else else
_llvm_version = '>= 3.3.0' _llvm_version = '>= 3.3.0'

2
src/gallium/drivers/swr/Makefile.am
View File

@ -356,7 +356,7 @@ include $(top_srcdir)/install-gallium-links.mk
dist-hook: dist-hook:
if SWR_INVALID_LLVM_VERSION if SWR_INVALID_LLVM_VERSION
@echo "*******************************************************" @echo "*******************************************************"
@echo "LLVM 3.9.0 or LLVM 3.9.1 required to create the tarball" @echo "LLVM 4.0.0 or LLVM 4.0.1 required to create the tarball"
@echo "*******************************************************" @echo "*******************************************************"
@test @test
endif endif

4
src/gallium/drivers/swr/SConscript
View File

@ -12,8 +12,8 @@ if not env['llvm']:
env['swr'] = False env['swr'] = False
Return() Return()
if env['LLVM_VERSION'] < distutils.version.LooseVersion('3.9'): if env['LLVM_VERSION'] < distutils.version.LooseVersion('4.0'):
print("warning: swr requires LLVM >= 3.9: not building swr") print("warning: swr requires LLVM >= 4.0: not building swr")
env['swr'] = False env['swr'] = False
Return() Return()