Commit cafff78f by Ben Clayton

CMake: Add option for selecting LLVM version.

And move LLVM_DIR and LLVM_CONFIG_DIR into the llvm's CMakeLists.txt Bug: b/145758253 Bug: b/152339534 Change-Id: I29e555e09b82dcf77cd9e9d57b5fb8a477473bbe Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43008 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com> Tested-by: 's avatarBen Clayton <bclayton@google.com>
parent e322072a
...@@ -149,10 +149,13 @@ else() ...@@ -149,10 +149,13 @@ else()
endif() endif()
set(DEFAULT_REACTOR_BACKEND "LLVM") set(DEFAULT_REACTOR_BACKEND "LLVM")
set(REACTOR_BACKEND ${DEFAULT_REACTOR_BACKEND} CACHE STRING "JIT compiler back-end used by Reactor") set(REACTOR_BACKEND ${DEFAULT_REACTOR_BACKEND} CACHE STRING "JIT compiler back-end used by Reactor")
set_property(CACHE REACTOR_BACKEND PROPERTY STRINGS LLVM Subzero) set_property(CACHE REACTOR_BACKEND PROPERTY STRINGS LLVM Subzero)
set(DEFAULT_SWIFTSHADER_LLVM_VERSION "7.0")
set(SWIFTSHADER_LLVM_VERSION ${DEFAULT_SWIFTSHADER_LLVM_VERSION} CACHE STRING "LLVM version to use")
set_property(CACHE SWIFTSHADER_LLVM_VERSION PROPERTY STRINGS "7.0" "10.0")
# If defined, overrides the default optimization level of the current reactor backend. # If defined, overrides the default optimization level of the current reactor backend.
# Set to one of the rr::Optimization::Level enum values. # Set to one of the rr::Optimization::Level enum values.
set(REACTOR_DEFAULT_OPT_LEVEL "Default" CACHE STRING "Reactor default optimization level") set(REACTOR_DEFAULT_OPT_LEVEL "Default" CACHE STRING "Reactor default optimization level")
...@@ -345,8 +348,6 @@ set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler) ...@@ -345,8 +348,6 @@ set(OPENGL_COMPILER_DIR ${OPENGL_DIR}/compiler)
set(VULKAN_DIR ${SOURCE_DIR}/Vulkan) set(VULKAN_DIR ${SOURCE_DIR}/Vulkan)
set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party) set(THIRD_PARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party)
set(ASTC_DIR ${THIRD_PARTY_DIR}/astc-encoder) set(ASTC_DIR ${THIRD_PARTY_DIR}/astc-encoder)
set(LLVM_DIR ${THIRD_PARTY_DIR}/llvm-7.0/llvm)
set(LLVM_CONFIG_DIR ${THIRD_PARTY_DIR}/llvm-7.0/configs)
set(LIBBACKTRACE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src) set(LIBBACKTRACE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src)
set(LIBBACKTRACE_CONFIG_DIR ${THIRD_PARTY_DIR}/libbacktrace/config) set(LIBBACKTRACE_CONFIG_DIR ${THIRD_PARTY_DIR}/libbacktrace/config)
set(LIBBACKTRACE_INCLUDE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src) set(LIBBACKTRACE_INCLUDE_DIR ${THIRD_PARTY_DIR}/libbacktrace/src)
...@@ -593,7 +594,7 @@ endif() ...@@ -593,7 +594,7 @@ endif()
########################################################### ###########################################################
# LLVM # LLVM
########################################################### ###########################################################
add_subdirectory(third_party/llvm-7.0) add_subdirectory(third_party/llvm-${SWIFTSHADER_LLVM_VERSION})
########################################################### ###########################################################
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
set(LLVM_DIR ${CMAKE_CURRENT_SOURCE_DIR}/llvm)
set(LLVM_CONFIG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/configs)
set(LLVM_LIST set(LLVM_LIST
${LLVM_DIR}/lib/Analysis/AliasAnalysis.cpp ${LLVM_DIR}/lib/Analysis/AliasAnalysis.cpp
${LLVM_DIR}/lib/Analysis/AliasAnalysisSummary.cpp ${LLVM_DIR}/lib/Analysis/AliasAnalysisSummary.cpp
......
Markdown is supported
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