Index: CMakeLists.txt =================================================================== --- CMakeLists.txt +++ CMakeLists.txt @@ -494,29 +494,6 @@ option(LLVM_USE_SPLIT_DWARF "Use -gsplit-dwarf when compiling llvm." OFF) -option(LLVM_POLLY_LINK_INTO_TOOLS "Statically link Polly into tools (if available)" ON) -option(LLVM_POLLY_BUILD "Build LLVM with Polly" ON) - -if (EXISTS ${LLVM_MAIN_SRC_DIR}/tools/polly/CMakeLists.txt) - set(POLLY_IN_TREE TRUE) -elseif(LLVM_EXTERNAL_POLLY_SOURCE_DIR) - set(POLLY_IN_TREE TRUE) -else() - set(POLLY_IN_TREE FALSE) -endif() - -if (LLVM_POLLY_BUILD AND POLLY_IN_TREE) - set(WITH_POLLY ON) -else() - set(WITH_POLLY OFF) -endif() - -if (LLVM_POLLY_LINK_INTO_TOOLS AND WITH_POLLY) - set(LINK_POLLY_INTO_TOOLS ON) -else() - set(LINK_POLLY_INTO_TOOLS OFF) -endif() - # Define an option controlling whether we should build for 32-bit on 64-bit # platforms, where supported. if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 ) @@ -1143,3 +1120,27 @@ add_subdirectory(utils/benchmark) add_subdirectory(benchmarks) endif() + +# generate X Macro file for extension handling. It provides a +# HANDLE_EXTENSION(extension_namespace, ExtensionProject) call for each extension +# allowing client code to define HANDLE_EXTENSION to have a specific code be run for +# each extension. +get_property(LLVM_EXTENSIONS GLOBAL PROPERTY LLVM_EXTENSIONS) +file(WRITE "${CMAKE_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "//extension handlers\n") +foreach(llvm_extension ${LLVM_EXTENSIONS}) + string(TOLOWER ${llvm_extension} llvm_extension_namespace) + + string(TOUPPER ${llvm_extension} llvm_extension_upper) + string(SUBSTRING ${llvm_extension_upper} 0 1 llvm_extension_upper_first) + string(SUBSTRING ${llvm_extension_namespace} 1 -1 llvm_extension_lower_tail) + string(CONCAT llvm_extension_project ${llvm_extension_upper_first} ${llvm_extension_lower_tail}) + + file(APPEND "${CMAKE_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "HANDLE_EXTENSION(${llvm_extension_namespace}, ${llvm_extension_project})\n") +endforeach() +file(APPEND "${CMAKE_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "#undef HANDLE_EXTENSION\n") + +# only replace if there's an actual change +execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_BINARY_DIR}/include/llvm/Support/Extension.def.tmp" "${CMAKE_BINARY_DIR}/include/llvm/Support/Extension.def") +file(REMOVE "${CMAKE_BINARY_DIR}/include/llvm/Support/Extension.def.tmp") + + Index: cmake/modules/AddLLVM.cmake =================================================================== --- cmake/modules/AddLLVM.cmake +++ cmake/modules/AddLLVM.cmake @@ -803,6 +803,26 @@ llvm_codesign(${name} ENTITLEMENTS ${ARG_ENTITLEMENTS}) endmacro(add_llvm_executable name) +# register_llvm_extension(name) +# Register ${name} as an llvm compiler extension. +# A compiler extension must define three functions in namespace ${name} +# - void initialize${Name}Passes(llvm::PassRegistry &Registry) that calls the initializer of dependant passes/ analyse +# - void register${Name}Passes(llvm::legacy::PassManagerBase &PM) that registers all the extension passes to `opt`, legacy PM +# - void Register${Name}Passes(llvm::PassBuilder &PB) that registers all the extension passes to `opt`, new PM + +function(register_llvm_extension name) + message(STATUS "Registering ${name} as a compiler extension") + set(LLVM_ALL_EXTENSION_TARGETS clang;bugpoint;opt) + + set_property(GLOBAL APPEND PROPERTY LLVM_EXTENSIONS ${name}) + foreach(tool ${LLVM_ALL_EXTENSION_TARGETS}) + if(TARGET ${tool}) + set_property(TARGET ${tool} APPEND PROPERTY LLVM_COMPILER_EXTENSIONS ${name}) + endif() + endforeach() +endfunction(register_llvm_extension) + + function(export_executable_symbols target) if (LLVM_EXPORTED_SYMBOL_FILE) # The symbol file should contain the symbols we want the executable to Index: include/llvm/Config/llvm-config.h.cmake =================================================================== --- include/llvm/Config/llvm-config.h.cmake +++ include/llvm/Config/llvm-config.h.cmake @@ -17,9 +17,6 @@ /* Define if LLVM_ENABLE_DUMP is enabled */ #cmakedefine LLVM_ENABLE_DUMP -/* Define if we link Polly to the tools */ -#cmakedefine LINK_POLLY_INTO_TOOLS - /* Target triple LLVM will generate code for by default */ #cmakedefine LLVM_DEFAULT_TARGET_TRIPLE "${LLVM_DEFAULT_TARGET_TRIPLE}" Index: tools/CMakeLists.txt =================================================================== --- tools/CMakeLists.txt +++ tools/CMakeLists.txt @@ -9,14 +9,6 @@ # traversing each directory. create_llvm_tool_options() -# Build polly before the tools: the tools link against polly when -# LINK_POLLY_INTO_TOOLS is set. -if(WITH_POLLY) - add_llvm_external_project(polly) -else() - set(LLVM_TOOL_POLLY_BUILD Off) -endif() - if(NOT LLVM_BUILD_LLVM_DYLIB AND NOT LLVM_BUILD_LLVM_C_DYLIB) set(LLVM_TOOL_LLVM_SHLIB_BUILD Off) endif() @@ -46,6 +38,11 @@ add_llvm_external_project(lld) add_llvm_external_project(lldb) +# projects sensible to extension property (namely clang, opt and bugpoint) +# must be declared before extensions +add_llvm_external_project(opt) +add_llvm_external_project(bugpoint) + # Automatically add remaining sub-directories containing a 'CMakeLists.txt' # file as external projects. add_llvm_implicit_projects() Index: tools/bugpoint/CMakeLists.txt =================================================================== --- tools/bugpoint/CMakeLists.txt +++ tools/bugpoint/CMakeLists.txt @@ -36,9 +36,4 @@ intrinsics_gen ) export_executable_symbols(bugpoint) - -if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS) - target_link_libraries(bugpoint PRIVATE Polly) - # Ensure LLVMTarget can resolve dependences in Polly. - target_link_libraries(bugpoint PRIVATE LLVMTarget) -endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS) +target_link_libraries(bugpoint PRIVATE $) Index: tools/bugpoint/bugpoint.cpp =================================================================== --- tools/bugpoint/bugpoint.cpp +++ tools/bugpoint/bugpoint.cpp @@ -109,11 +109,8 @@ }; } -#ifdef LINK_POLLY_INTO_TOOLS -namespace polly { -void initializePollyPasses(llvm::PassRegistry &Registry); -} -#endif +#define HANDLE_EXTENSION(Ns, Ext) namespace Ns { void initialize##Ext##Passes(llvm::PassRegistry &Registry); } +#include "llvm/Support/Extension.def" int main(int argc, char **argv) { #ifndef DEBUG_BUGPOINT @@ -134,9 +131,8 @@ initializeInstrumentation(Registry); initializeTarget(Registry); -#ifdef LINK_POLLY_INTO_TOOLS - polly::initializePollyPasses(Registry); -#endif +#define HANDLE_EXTENSION(Ns, Ext) Ns::initialize##Ext##Passes(Registry); +#include "llvm/Support/Extension.def" if (std::getenv("bar") == (char*) -1) { InitializeAllTargets(); Index: tools/clang/tools/driver/CMakeLists.txt =================================================================== --- tools/clang/tools/driver/CMakeLists.txt +++ tools/clang/tools/driver/CMakeLists.txt @@ -123,6 +123,4 @@ endif() endif() -if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS) - target_link_libraries(clang PRIVATE Polly) -endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS) +target_link_libraries(clang PRIVATE $) Index: tools/clang/tools/driver/cc1_main.cpp =================================================================== --- tools/clang/tools/driver/cc1_main.cpp +++ tools/clang/tools/driver/cc1_main.cpp @@ -69,11 +69,8 @@ exit(GenCrashDiag ? 70 : 1); } -#ifdef LINK_POLLY_INTO_TOOLS -namespace polly { -void initializePollyPasses(llvm::PassRegistry &Registry); -} -#endif +#define HANDLE_EXTENSION(Ns, Ext) namespace Ns { void initialize##Ext##Passes(llvm::PassRegistry &Registry); } +#include "llvm/Support/Extension.def" #ifdef CLANG_HAVE_RLIMITS #if defined(__linux__) && defined(__PIE__) @@ -183,10 +180,8 @@ llvm::InitializeAllAsmPrinters(); llvm::InitializeAllAsmParsers(); -#ifdef LINK_POLLY_INTO_TOOLS - llvm::PassRegistry &Registry = *llvm::PassRegistry::getPassRegistry(); - polly::initializePollyPasses(Registry); -#endif +#define HANDLE_EXTENSION(Ns, Ext) { llvm::PassRegistry &Registry = *llvm::PassRegistry::getPassRegistry(); Ns::initialize##Ext##Passes(Registry); } +#include "llvm/Support/Extension.def" // Buffer diagnostics from argument parsing so that we can output them using a // well formed diagnostic object. Index: tools/opt/CMakeLists.txt =================================================================== --- tools/opt/CMakeLists.txt +++ tools/opt/CMakeLists.txt @@ -37,7 +37,4 @@ intrinsics_gen ) export_executable_symbols(opt) - -if(WITH_POLLY AND LINK_POLLY_INTO_TOOLS) - target_link_libraries(opt PRIVATE Polly) -endif(WITH_POLLY AND LINK_POLLY_INTO_TOOLS) +target_link_libraries(opt PRIVATE $) Index: tools/opt/NewPMDriver.cpp =================================================================== --- tools/opt/NewPMDriver.cpp +++ tools/opt/NewPMDriver.cpp @@ -202,11 +202,8 @@ }); } -#ifdef LINK_POLLY_INTO_TOOLS -namespace polly { -void RegisterPollyPasses(PassBuilder &); -} -#endif +#define HANDLE_EXTENSION(Ns, Ext) namespace Ns { void Register##Ext##Passes(PassBuilder &); } +#include "llvm/Support/Extension.def" bool llvm::runPassPipeline(StringRef Arg0, Module &M, TargetMachine *TM, ToolOutputFile *Out, ToolOutputFile *ThinLTOLinkOut, @@ -290,9 +287,8 @@ return false; }); -#ifdef LINK_POLLY_INTO_TOOLS - polly::RegisterPollyPasses(PB); -#endif +#define HANDLE_EXTENSION(Ns, Ext) Ns::Register##Ext##Passes(PB); +#include "llvm/Support/Extension.def" // Specially handle the alias analysis manager so that we can register // a custom pipeline of AA passes with it. Index: tools/opt/opt.cpp =================================================================== --- tools/opt/opt.cpp +++ tools/opt/opt.cpp @@ -470,11 +470,8 @@ getCodeModel(), GetCodeGenOptLevel()); } -#ifdef LINK_POLLY_INTO_TOOLS -namespace polly { -void initializePollyPasses(llvm::PassRegistry &Registry); -} -#endif +#define HANDLE_EXTENSION(Ns, Ext) namespace Ns { void initialize##Ext##Passes(llvm::PassRegistry &Registry); } +#include "llvm/Support/Extension.def" //===----------------------------------------------------------------------===// // main for opt @@ -529,9 +526,8 @@ initializeWasmEHPreparePass(Registry); initializeWriteBitcodePassPass(Registry); -#ifdef LINK_POLLY_INTO_TOOLS - polly::initializePollyPasses(Registry); -#endif +#define HANDLE_EXTENSION(Ns, Ext) Ns::initialize##Ext##Passes(Registry); +#include "llvm/Support/Extension.def" cl::ParseCommandLineOptions(argc, argv, "llvm .bc -> .bc modular optimizer and analysis printer\n"); Index: tools/polly/CMakeLists.txt =================================================================== --- tools/polly/CMakeLists.txt +++ tools/polly/CMakeLists.txt @@ -208,3 +208,7 @@ add_custom_target(polly-update-format DEPENDS ${update_format_depends}) set_target_properties(polly-update-format PROPERTIES FOLDER "Polly") +register_llvm_extension(polly) + +# Polly-ACC requires the NVPTX target to be present in the executable it is linked to +set_property(TARGET bugpoint APPEND PROPERTY LLVM_COMPILER_EXTENSIONS LLVMTarget) Index: utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn =================================================================== --- utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +++ utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn @@ -321,7 +321,6 @@ output = "$target_gen_dir/llvm-config.h" values = [ "LLVM_ENABLE_DUMP=", - "LINK_POLLY_INTO_TOOLS=", "LLVM_DEFAULT_TARGET_TRIPLE=$llvm_target_triple", "LLVM_HAS_ATOMICS=1", "LLVM_HOST_TRIPLE=$llvm_current_triple",