Commit 25382c0d authored by Chuck Atkins's avatar Chuck Atkins
Browse files

Merge branch 'update-llvm-and-mesa' into 'master'

Update llvm and mesa

See merge request paraview/paraview-superbuild!412
parents 89385ce2 cccb7895
......@@ -306,4 +306,8 @@ if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/superbuild/CMakeLists.txt")
"and `git submodule update`?")
endif ()
if(BUILD_SHARED_LIBS AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
string(APPEND superbuild_ld_flags "-shared-intel")
endif()
add_subdirectory(superbuild)
if (CMAKE_CXX_COMPILER_ID MATCHES "Intel")
superbuild_append_flags(
cxx_flags "-diag-disable=177,597,873,1098,1292,2026,3373"
cxx_flags "-diag-disable=177,597,873,1098,1292,2026,3373,3884"
PROJECT_ONLY)
endif ()
......@@ -9,12 +9,16 @@ superbuild_add_project(llvm
DEPENDS python cxx11
CMAKE_ARGS
-DCMAKE_BUILD_TYPE=Release
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DLLVM_BUILD_LLVM_DYLIB=ON
-DLLVM_ENABLE_RTTI=ON
-DLLVM_INSTALL_UTILS=ON
-DLLVM_TARGETS_TO_BUILD:STRING=X86 # FIXME: When using this on PowerPC,
# this will need to be updated.
-DPYTHON_EXECUTABLE=${superbuild_python_executable})
superbuild_apply_patch(${project} fix-static-assert
"Fix the intel compiler being too sensitive about static asserts")
set(llvm_dir "<INSTALL_DIR>")
set(mesa_type_args --disable-gallium-osmesa --enable-glx --with-platforms=x11)
set(mesa_type_args --disable-osmesa --disable-gallium-osmesa --enable-glx --with-platforms=x11)
set(mesa_type_deps glproto)
include(mesa.common)
......
......@@ -8,9 +8,16 @@ endif ()
option(mesa_USE_SWR "Enable the OpenSWR driver" "${mesa_swr_default}")
mark_as_advanced(mesa_USE_SWR)
set(mesa_SWR_ARCH "avx,avx2"
CACHE STRING "backend architectures to be used by Sthe SWR driver")
mark_as_advanced(mesa_USE_SWR_ARCH)
set_property(CACHE mesa_SWR_ARCH PROPERTY STRINGS
"avx" "avx,avx2" "avx,avx2,knl" "avx,avx2,skx" "avx,avx2,knl,skx")
set(mesa_drivers swrast)
if (mesa_USE_SWR)
list(APPEND mesa_drivers swr)
set(mesa_swr_arch "--with-swr-arch=${mesa_USE_SWR_ARCH}")
endif ()
option(mesa_USE_TEXTURE_FLOAT
......@@ -41,12 +48,13 @@ set(mesa_common_config_args
--prefix=<INSTALL_DIR>
--enable-opengl --disable-gles1 --disable-gles2
--disable-va --disable-gbm --disable-xvmc --disable-vdpau
--enable-shared-glapi
--disable-shared-glapi
${mesa_texture_float_args}
--disable-dri --with-dri-drivers=
--enable-llvm --enable-llvm-shared-libs
--enable-llvm
--with-llvm-prefix=${llvm_dir}
--with-gallium-drivers=${mesa_drivers}
${mesa_swr_arch}
--disable-egl --disable-gbm)
if (BUILD_SHARED_LIBS)
......
set(mesa_type_args --enable-gallium-osmesa --disable-glx --with-platforms=)
set(mesa_type_args --disable-osmesa --enable-gallium-osmesa --disable-glx --with-platforms=)
set(mesa_type_deps)
include(mesa.common)
......
--- llvm-5.0.1.src/lib/IR/Attributes.cpp.orig 2018-02-14 16:39:55.983961116 -0500
+++ llvm-5.0.1.src/lib/IR/Attributes.cpp 2018-02-14 16:39:15.111672713 -0500
@@ -795,7 +795,7 @@
static constexpr unsigned attrIdxToArrayIdx(unsigned Index) {
// MSVC warns about '~0U + 1' wrapping around when this is called on
// FunctionIndex, so cast to int first.
- return static_cast<int>(Index) + 1;
+ return static_cast<unsigned>(static_cast<int>(Index)) + 1;
}
AttributeListImpl::AttributeListImpl(LLVMContext &C,
superbuild_set_revision(llvm
URL "http://www.paraview.org/files/dependencies/llvm-4.0.0.src.tar.xz"
URL_MD5 ea9139a604be702454f6acf160b4f3a2)
URL "http://www.paraview.org/files/dependencies/llvm-5.0.1.src.tar.xz"
URL_MD5 3a4ec6dcbc71579eeaec7cb157fe2168)
superbuild_set_revision(glproto
URL "http://www.paraview.org/files/dependencies/glproto-1.4.17.tar.bz2"
URL_MD5 5565f1b0facf4a59c2778229c1f70d10)
superbuild_set_revision(mesa
URL "http://www.paraview.org/files/dependencies/mesa-17.1.4.tar.xz"
URL_MD5 be2ef7c9edec23b07f74f6512a6a6fa5)
URL "http://www.paraview.org/files/dependencies/mesa-18.0.0-rc4.tar.xz"
URL_MD5 195889b71ee88785d55b03d99e0034d3)
get_property(mesa_revision GLOBAL PROPERTY mesa_revision)
superbuild_set_revision(osmesa ${mesa_revision})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment