Re: [Mesa-dev] [PATCH] amd: remove support for LLVM 5.0
On Mon, 2018-07-02 at 09:32 +1000, Timothy Arceri wrote: > Reviewed-by: Timothy Arceri > > On 02/07/18 05:50, Marek Olšák wrote: > > From: Marek Olšák > > > > Users are encouraged to switch to LLVM 6.0 released in March 2018. > > --- > > .travis.yml | 24 ++-- > > configure.ac | 4 +- > > meson.build | 4 +- > > src/amd/common/ac_llvm_build.c| 129 > > +- > > src/amd/common/ac_llvm_helper.cpp | 4 - > > src/gallium/drivers/radeonsi/si_shader.c | 24 > > src/gallium/drivers/radeonsi/si_shader_nir.c | 7 -- > > src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c | 8 +- > > 8 files changed, 45 insertions(+), 159 deletions(-) > > > > diff --git a/.travis.yml b/.travis.yml > > index 012cc91..2f04747 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -118,37 +118,37 @@ matrix: > > - x11proto-xf86vidmode-dev > > - libexpat1-dev > > - libx11-xcb-dev > > - libelf-dev > > - libunwind8-dev > > - env: > > - LABEL="make Gallium Drivers RadeonSI" > > - BUILD=make > > - MAKEFLAGS="-j4" > > - MAKE_CHECK_COMMAND="true" > > -- LLVM_VERSION=5.0 > > +- LLVM_VERSION=6.0 > > - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" > > - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" > > - 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_DRIVERS="radeonsi" > > - VULKAN_DRIVERS="" > > - LIBUNWIND_FLAGS="--enable-libunwind" > > addons: > > apt: > > sources: > > -- llvm-toolchain-trusty-5.0 > > +- llvm-toolchain-trusty-6.0 > > packages: > > # LLVM packaging is broken and misses these dependencies > > - libedit-dev > > # From sources above > > -- llvm-5.0-dev > > +- llvm-6.0-dev > > # Common > > - xz-utils > > - x11proto-xf86vidmode-dev > > - libexpat1-dev > > - libx11-xcb-dev > > - libelf-dev > > - libunwind8-dev > > - env: > > - LABEL="make Gallium Drivers Other" > > - BUILD=make > > @@ -251,47 +251,47 @@ matrix: > > - libclang-4.0-dev > > # Common > > - xz-utils > > - x11proto-xf86vidmode-dev > > - libexpat1-dev > > - libx11-xcb-dev > > - libelf-dev > > - libunwind8-dev > > - env: > > # NOTE: Analogous to SWR above, building Clover is quite slow. > > -- LABEL="make Gallium ST Clover LLVM-5.0" > > +- LABEL="make Gallium ST Clover LLVM-6.0" > > - BUILD=make > > - MAKEFLAGS="-j4" > > - MAKE_CHECK_COMMAND="true" > > -- LLVM_VERSION=5.0 > > +- LLVM_VERSION=6.0 > > - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" > > - OVERRIDE_CC=gcc-4.8 > > - OVERRIDE_CXX=g++-4.8 > > - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" > > - DRI_DRIVERS="" > > - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd > > --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau > > --disable-va --disable-omx-bellagio --disable-gallium-osmesa" > > - GALLIUM_DRIVERS="r600,radeonsi" > > - VULKAN_DRIVERS="" > > - LIBUNWIND_FLAGS="--enable-libunwind" > > addons: > > apt: > > sources: > > -- llvm-toolchain-trusty-5.0 > > +- llvm-toolchain-trusty-6.0 > > packages: > > - libclc-dev > > # LLVM packaging is broken and misses these dependencies > > - libedit-dev > > - g++-4.8 > > # From sources above > > -- llvm-5.0-dev > > -- clang-5.0 > > -- libclang-5.0-dev > > +- llvm-6.0-dev > > +- clang-6.0 > > +- libclang-6.0-dev > > # Common > > - xz-utils > > - x11proto-xf86vidmode-dev > > - libexpat1-dev > > - libx11-xcb-dev > > - libelf-dev > > - libunwind8-dev The clover parts are wrong. There already is LLVM-6 testing below, no need to duplicate it. All you need to do is to drop radeonsi from llvm-5 env. Jan > > - env: > > # NOTE: Analogous to SWR above, building Clover is quite slow. > > - LABEL="make Gallium ST Clover
Re: [Mesa-dev] [PATCH] amd: remove support for LLVM 5.0
Reviewed-by: Timothy Arceri On 02/07/18 05:50, Marek Olšák wrote: From: Marek Olšák Users are encouraged to switch to LLVM 6.0 released in March 2018. --- .travis.yml | 24 ++-- configure.ac | 4 +- meson.build | 4 +- src/amd/common/ac_llvm_build.c| 129 +- src/amd/common/ac_llvm_helper.cpp | 4 - src/gallium/drivers/radeonsi/si_shader.c | 24 src/gallium/drivers/radeonsi/si_shader_nir.c | 7 -- src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c | 8 +- 8 files changed, 45 insertions(+), 159 deletions(-) diff --git a/.travis.yml b/.travis.yml index 012cc91..2f04747 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,37 +118,37 @@ matrix: - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: - LABEL="make Gallium Drivers RadeonSI" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" -- LLVM_VERSION=5.0 +- LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - 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_DRIVERS="radeonsi" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: sources: -- llvm-toolchain-trusty-5.0 +- llvm-toolchain-trusty-6.0 packages: # LLVM packaging is broken and misses these dependencies - libedit-dev # From sources above -- llvm-5.0-dev +- llvm-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: - LABEL="make Gallium Drivers Other" - BUILD=make @@ -251,47 +251,47 @@ matrix: - libclang-4.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: # NOTE: Analogous to SWR above, building Clover is quite slow. -- LABEL="make Gallium ST Clover LLVM-5.0" +- LABEL="make Gallium ST Clover LLVM-6.0" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" -- LLVM_VERSION=5.0 +- LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - OVERRIDE_CC=gcc-4.8 - OVERRIDE_CXX=g++-4.8 - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - GALLIUM_DRIVERS="r600,radeonsi" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: sources: -- llvm-toolchain-trusty-5.0 +- llvm-toolchain-trusty-6.0 packages: - libclc-dev # LLVM packaging is broken and misses these dependencies - libedit-dev - g++-4.8 # From sources above -- llvm-5.0-dev -- clang-5.0 -- libclang-5.0-dev +- llvm-6.0-dev +- clang-6.0 +- libclang-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: # NOTE: Analogous to SWR above, building Clover is quite slow. - LABEL="make Gallium ST Clover LLVM-6.0" @@ -359,37 +359,37 @@ matrix: - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: - LABEL="make Vulkan" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" -- LLVM_VERSION=5.0 +- LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl
[Mesa-dev] [PATCH] amd: remove support for LLVM 5.0
From: Marek Olšák Users are encouraged to switch to LLVM 6.0 released in March 2018. --- .travis.yml | 24 ++-- configure.ac | 4 +- meson.build | 4 +- src/amd/common/ac_llvm_build.c| 129 +- src/amd/common/ac_llvm_helper.cpp | 4 - src/gallium/drivers/radeonsi/si_shader.c | 24 src/gallium/drivers/radeonsi/si_shader_nir.c | 7 -- src/gallium/drivers/radeonsi/si_shader_tgsi_alu.c | 8 +- 8 files changed, 45 insertions(+), 159 deletions(-) diff --git a/.travis.yml b/.travis.yml index 012cc91..2f04747 100644 --- a/.travis.yml +++ b/.travis.yml @@ -118,37 +118,37 @@ matrix: - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: - LABEL="make Gallium Drivers RadeonSI" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" -- LLVM_VERSION=5.0 +- LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - 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_DRIVERS="radeonsi" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: sources: -- llvm-toolchain-trusty-5.0 +- llvm-toolchain-trusty-6.0 packages: # LLVM packaging is broken and misses these dependencies - libedit-dev # From sources above -- llvm-5.0-dev +- llvm-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: - LABEL="make Gallium Drivers Other" - BUILD=make @@ -251,47 +251,47 @@ matrix: - libclang-4.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: # NOTE: Analogous to SWR above, building Clover is quite slow. -- LABEL="make Gallium ST Clover LLVM-5.0" +- LABEL="make Gallium ST Clover LLVM-6.0" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" -- LLVM_VERSION=5.0 +- LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - OVERRIDE_CC=gcc-4.8 - OVERRIDE_CXX=g++-4.8 - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - GALLIUM_DRIVERS="r600,radeonsi" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: sources: -- llvm-toolchain-trusty-5.0 +- llvm-toolchain-trusty-6.0 packages: - libclc-dev # LLVM packaging is broken and misses these dependencies - libedit-dev - g++-4.8 # From sources above -- llvm-5.0-dev -- clang-5.0 -- libclang-5.0-dev +- llvm-6.0-dev +- clang-6.0 +- libclang-6.0-dev # Common - xz-utils - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: # NOTE: Analogous to SWR above, building Clover is quite slow. - LABEL="make Gallium ST Clover LLVM-6.0" @@ -359,37 +359,37 @@ matrix: - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: - LABEL="make Vulkan" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" -- LLVM_VERSION=5.0 +- LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - GALLIUM_DRIVERS="" -