From b264787453fd93e55154b98d18739ecb383d9b4c Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 22 Nov 2022 22:56:55 -0800 Subject: libclc: Use cmake files instead of llvm-config Reviewed By: mgorny Differential Revision: https://reviews.llvm.org/D137854 --- libclc/CMakeLists.txt | 92 +++++++++++++----------------------------- libclc/check_external_calls.sh | 8 +--- 2 files changed, 28 insertions(+), 72 deletions(-) (limited to 'libclc') diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt index 96519e0..0a23471 100644 --- a/libclc/CMakeLists.txt +++ b/libclc/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.13.4) -project( libclc VERSION 0.2.0 LANGUAGES CXX ) +project( libclc VERSION 0.2.0 LANGUAGES CXX C) + include( GNUInstallDirs ) set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS amdgcn-amdhsa/lib/SOURCES; @@ -40,20 +41,17 @@ set( LIBCLC_TARGETS_TO_BUILD "all" option( ENABLE_RUNTIME_SUBNORMAL "Enable runtime linking of subnormal support." OFF ) -if( NOT LLVM_CONFIG ) - find_program( LLVM_CONFIG llvm-config ) -endif() -execute_process( COMMAND ${LLVM_CONFIG} "--version" - OUTPUT_VARIABLE LLVM_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE ) -message( "LLVM version: ${LLVM_VERSION}" ) +find_package(LLVM REQUIRED HINTS "${LLVM_CMAKE_DIR}") +include(AddLLVM) + +message( "LLVM version: ${LLVM_PACKAGE_VERSION}" ) -if( ${LLVM_VERSION} VERSION_LESS ${LIBCLC_MIN_LLVM} ) +if( ${LLVM_PACKAGE_VERSION} VERSION_LESS ${LIBCLC_MIN_LLVM} ) message( FATAL_ERROR "libclc needs at least LLVM ${LIBCLC_MIN_LLVM}" ) endif() # mesa3d environment is only available since LLVM 4.0 -if( ${LLVM_VERSION} VERSION_GREATER "3.9.0" ) +if( ${LLVM_PACKAGE_VERSION} VERSION_GREATER "3.9.0" ) set( LIBCLC_TARGETS_ALL ${LIBCLC_TARGETS_ALL} amdgcn-mesa-mesa3d ) endif() @@ -61,45 +59,11 @@ if( LIBCLC_TARGETS_TO_BUILD STREQUAL "all" ) set( LIBCLC_TARGETS_TO_BUILD ${LIBCLC_TARGETS_ALL} ) endif() -execute_process( COMMAND ${LLVM_CONFIG} "--system-libs" - OUTPUT_VARIABLE LLVM_SYSTEM_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE ) -separate_arguments( LLVM_SYSTEM_LIBS ) -execute_process( COMMAND ${LLVM_CONFIG} "--libs" "core" "bitreader" "bitwriter" - OUTPUT_VARIABLE LLVM_LIBS - OUTPUT_STRIP_TRAILING_WHITESPACE ) -separate_arguments( LLVM_LIBS ) -execute_process( COMMAND ${LLVM_CONFIG} "--libdir" - OUTPUT_VARIABLE LLVM_LIBDIR - OUTPUT_STRIP_TRAILING_WHITESPACE ) -execute_process( COMMAND ${LLVM_CONFIG} "--ldflags" - OUTPUT_VARIABLE LLVM_LD_FLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE ) -execute_process( COMMAND ${LLVM_CONFIG} "--cxxflags" - OUTPUT_VARIABLE LLVM_CXX_FLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE ) -separate_arguments( LLVM_CXX_FLAGS ) -execute_process( COMMAND ${LLVM_CONFIG} "--bindir" - OUTPUT_VARIABLE LLVM_BINDIR - OUTPUT_STRIP_TRAILING_WHITESPACE ) - -# These were not properly reported in early LLVM and we don't need them -list( APPEND LLVM_CXX_FLAGS -fno-rtti -fno-exceptions ) - -# Print LLVM variables -message( "LLVM system libs: ${LLVM_SYSTEM_LIBS}" ) -message( "LLVM libs: ${LLVM_LIBS}" ) -message( "LLVM libdir: ${LLVM_LIBDIR}" ) -message( "LLVM bindir: ${LLVM_BINDIR}" ) -message( "LLVM ld flags: ${LLVM_LD_FLAGS}" ) -message( "LLVM cxx flags: ${LLVM_CXX_FLAGS}" ) -message( "" ) - -find_program( LLVM_CLANG clang PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) -find_program( LLVM_AS llvm-as PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) -find_program( LLVM_LINK llvm-link PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) -find_program( LLVM_OPT opt PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) -find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_BINDIR} NO_DEFAULT_PATH ) +find_program( LLVM_CLANG clang PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) +find_program( LLVM_AS llvm-as PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) +find_program( LLVM_LINK llvm-link PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) +find_program( LLVM_OPT opt PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) +find_program( LLVM_SPIRV llvm-spirv PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) # Print toolchain message( "clang: ${LLVM_CLANG}" ) @@ -128,29 +92,29 @@ set( CMAKE_LLAsm_COMPILER ${LLVM_AS} ) set( CMAKE_LLAsm_ARCHIVE ${LLVM_LINK} ) # Construct LLVM version define -string( REPLACE "." ";" LLVM_VERSION_LIST ${LLVM_VERSION} ) -list( GET LLVM_VERSION_LIST 0 LLVM_MAJOR ) -list( GET LLVM_VERSION_LIST 1 LLVM_MINOR ) -set( LLVM_VERSION_DEFINE "-DHAVE_LLVM=0x${LLVM_MAJOR}0${LLVM_MINOR}" ) +set( LLVM_VERSION_DEFINE "-DHAVE_LLVM=0x${LLVM_VERSION_MAJOR}0${LLVM_VERSION_MINOR}" ) # LLVM 13 enables standard includes by default -if( ${LLVM_VERSION} VERSION_GREATER "12.99.99" ) +if( ${LLVM_PACKAGE_VERSION} VERSION_GREATER "12.99.99" ) set( CMAKE_LLAsm_FLAGS "${CMAKE_LLAsm_FLAGS} -cl-no-stdinc") set( CMAKE_CLC_FLAGS "${CMAKE_CLC_FLAGS} -cl-no-stdinc") endif() enable_language( CLC LLAsm ) - # This needs to be set before any target that needs it -link_directories( ${LLVM_LIBDIR} ) +include_directories( ${LLVM_INCLUDE_DIR} ) # Setup prepare_builtins tools -add_executable( prepare_builtins utils/prepare-builtins.cpp ) -target_compile_options( prepare_builtins PRIVATE ${LLVM_CXX_FLAGS} ) +set(LLVM_LINK_COMPONENTS + BitReader + BitWriter + Core +) +add_llvm_executable( prepare_builtins utils/prepare-builtins.cpp ) target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) -target_link_libraries( prepare_builtins PRIVATE ${LLVM_LIBS} ) -target_link_libraries( prepare_builtins PRIVATE ${LLVM_SYSTEM_LIBS} ) +# These were not properly reported in early LLVM and we don't need them +target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) # Setup arch devices set( r600--_devices cedar cypress barts cayman ) @@ -175,12 +139,12 @@ set( tahiti_aliases pitcairn verde oland hainan bonaire kabini kaveri hawaii mullins tonga iceland carrizo fiji stoney polaris10 polaris11 ) # Support for gfx9 was added in LLVM 5.0 (r295554) -if( ${LLVM_VERSION} VERSION_GREATER "4.99.99" ) +if( ${LLVM_PACKAGE_VERSION} VERSION_GREATER "4.99.99" ) set( tahiti_aliases ${tahiti_aliases} gfx900 gfx902 ) endif() # Support for Vega12 and Vega20 was added in LLVM 7 (r331215) -if( ${LLVM_VERSION} VERSION_GREATER "6.99.99" ) +if( ${LLVM_PACKAGE_VERSION} VERSION_GREATER "6.99.99" ) set( tahiti_aliases ${tahiti_aliases} gfx904 gfx906 ) endif() @@ -369,10 +333,8 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) # nvptx-- targets don't include workitem builtins if( NOT ${t} MATCHES ".*ptx.*--$" ) add_test( NAME external-calls-${obj_suffix} - COMMAND ./check_external_calls.sh ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} + COMMAND ./check_external_calls.sh ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} ${LLVM_TOOLS_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) - set_tests_properties( external-calls-${obj_suffix} - PROPERTIES ENVIRONMENT "LLVM_CONFIG=${LLVM_CONFIG}" ) endif() install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${obj_suffix} DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) diff --git a/libclc/check_external_calls.sh b/libclc/check_external_calls.sh index 80b595c..4de31a2 100755 --- a/libclc/check_external_calls.sh +++ b/libclc/check_external_calls.sh @@ -1,19 +1,13 @@ #!/bin/sh FILE=$1 +BIN_DIR=$2 if [ ! -f $FILE ]; then echo "ERROR: Not a file: $FILE" exit 3 fi ret=0 -if [ "x$LLVM_CONFIG" = "x" ]; then - LLVM_CONFIG=llvm-config - echo 'WARNING: $LLVM_CONFIG not set, falling back to $PATH llvm-config' - ret=2 -fi - -BIN_DIR=$($LLVM_CONFIG --bindir) DIS="$BIN_DIR/llvm-dis" if [ ! -x $DIS ]; then echo "ERROR: Disassembler '$DIS' is not executable" -- cgit v1.1