Use llvm_library_add support for components in Polly

[serge-sans-paille]

Summary

Instead of manually registering libraries as target_libraries in Polly, use the LINK_COMPONENTS option. It makes Polly's CMakefile easier to read, and generalizes https://reviews.llvm.org/D78332 to all plugins.

[efriedma]

Makes sense. LGTM

[serge-sans-paille]

Patch updated to make compiler extension compatible with LINK_COMPONENTS

[serge-sans-paille]

@sylvestre.ledru can you check this still work with your setup?

[serge-sans-paille]

Once rebased on https://reviews.llvm.org/D78192 this one should be much cleaner.

[serge-sans-paille]

Rebase this patch on https://reviews.llvm.org/D78192, which make sit much cleaner and straight-forward.

[serge-sans-paille]

@Meinersbur can you confirm this oe is okay with you?

[Meinersbur]

LGTM

[Meinersbur]

I got a new warning when compiling with clang:

In file included from /tmp/persistent/llvm-src/llvm/tools/llvm-config/llvm-config.cpp:51:
tools/llvm-config/ExtensionDependencies.inc:7:2: warning: suggest braces around initialization of subobject [-Wmissing-braces]
{"Polly", {"support", "core", "scalaropts", "instcombine", "transformutils", "analysis", "ipo", "mc", "passes", "linker", "irreader", "analysis", "bitreader", "mcparser", "object", "profiledata", "target", "vectorize", "PollyISL", "Polly",nullptr}}, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 {                                                                                                                                                                                                                                                      }

[serge-sans-paille]

In D78358#2008954, @Meinersbur wrote:

I got a new warning when compiling with clang:

In file included from /tmp/persistent/llvm-src/llvm/tools/llvm-config/llvm-config.cpp:51:
tools/llvm-config/ExtensionDependencies.inc:7:2: warning: suggest braces around initialization of subobject [-Wmissing-braces]
{"Polly", {"support", "core", "scalaropts", "instcombine", "transformutils", "analysis", "ipo", "mc", "passes", "linker", "irreader", "analysis", "bitreader", "mcparser", "object", "profiledata", "target", "vectorize", "PollyISL", "Polly",nullptr}}, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 {                                                                                                                                                                                                                                                      }

Should be fixed by 37309fb02f60557f18971dc575904c0fc56c91ab

[aheejin]

After this commit, builds with -DBUILD_SHARED_LIBS=ON fail.

[serge-sans-paille]

In D78358#2014810, @aheejin wrote:

After this commit, builds with -DBUILD_SHARED_LIBS=ON fail.

Can you share the other cmake options?

[aheejin]

This is my full compilation option, but I don't think anything other than -DBUILD_SHARED_LIBS=ON is relevant.

cmake -G Ninja -DCMAKE_C_COMPILER=$HOME/apps/clang+llvm/bin/clang -DCMAKE_CXX_COMPILER=$HOME/apps/clang+llvm/bin/clang++ -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DLLVM_TARGETS_TO_BUILD="X86;WebAssembly" -DLLVM_ENABLE_LIBCXX=ON -DLLVM_ENABLE_LLD=ON -DLLVM_ENABLE_ASSERTIONS=ON -DBUILD_SHARED_LIBS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DLLVM_BUILD_TESTS=ON -DCMAKE_CXX_FLAGS="-D_GLIBCXX_DEBUG" -DLLVM_INSTALL_UTILS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$HOME/llvm-git/install.debug -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra;compiler-rt;debuginfo-tests;libclc;libcxx;libcxxabi;libunwind;lld;lldb;openmp;parallel-libs;polly;pstl;test-suite" ../llvm

[serge-sans-paille]

@aheejin thanks! I was able to reproduce, https://reviews.llvm.org/D79295 should fix the issue, can you confirm that?

llvm/cmake/modules/AddLLVM.cmake

function(add_llvm_pass_plugin name)
   # Note: If was set to "all", LLVM's CMakeLists.txt replaces it with a
   # list of all projects, counting as explicitly enabled.
   set(link_into_tools_default OFF)
   if (ARG_SUBPROJECT AND LLVM_TOOL_${name_upper}_BUILD)
     set(link_into_tools_default ON)
   endif()
   option(LLVM_${name_upper}_LINK_INTO_TOOLS "Statically link ${name} into tools (if available)" ${link_into_tools_default})
 
+  # If we statically link the plugin, don't use llvm dylib because we're going
+  # to be part of it.
+  if(LLVM_${name_upper}_LINK_INTO_TOOLS)
+      list(APPEND ARG_UNPARSED_ARGUMENTS DISABLE_LLVM_LINK_LLVM_DYLIB)
+  endif()
+
   if(LLVM_${name_upper}_LINK_INTO_TOOLS)
     list(REMOVE_ITEM ARG_UNPARSED_ARGUMENTS BUILDTREE_ONLY)
     # process_llvm_pass_plugins takes care of the actual linking, just create an
     # object library as of now
-    add_llvm_component_library(${name} OBJECT ${ARG_UNPARSED_ARGUMENTS})
+    add_llvm_library(${name} OBJECT ${ARG_UNPARSED_ARGUMENTS})
     target_compile_definitions(${name} PRIVATE LLVM_${name_upper}_LINK_INTO_TOOLS)
     set_property(TARGET ${name} APPEND PROPERTY COMPILE_DEFINITIONS LLVM_LINK_INTO_TOOLS)
     if (TARGET intrinsics_gen)
       add_dependencies(obj.${name} intrinsics_gen)
     endif()
     set_property(GLOBAL APPEND PROPERTY LLVM_STATIC_EXTENSIONS ${name})
   elseif(NOT ARG_NO_MODULE)
     add_llvm_library(${name} MODULE ${ARG_UNPARSED_ARGUMENTS})

polly/lib/CMakeLists.txt

 # Compile ISL into a separate library.
 add_subdirectory(External)
 
 set(POLLY_HEADER_FILES)
 if (MSVC_IDE OR XCODE)
   file(GLOB_RECURSE POLLY_HEADER_FILES "${POLLY_SOURCE_DIR}/include/polly/*.h")
 endif ()
 
+set(POLLY_COMPONENTS
+    Support
+    Core
+    ScalarOpts
+    InstCombine
+    TransformUtils
+    Analysis
+    ipo
+    MC
+    Passes
+    Linker
+    IRReader
+    Analysis
+    # The libraries below are required for darwin: http://PR26392
+    BitReader
+    MCParser
+    Object
+    ProfileData
+    Target
+    Vectorize
+)
+
+# Polly-ACC requires the NVPTX backend to work. Ask LLVM about its libraries.
+if (GPU_CODEGEN)
+  # This call emits an error if they NVPTX backend is not enable.
+  list(APPEND POLLY_COMPONENTS NVPTX)
+endif ()
+
 # Use an object-library to add the same files to multiple libs without requiring
 # the sources them to be recompiled for each of them.
 add_llvm_pass_plugin(Polly
   NO_MODULE
   SUBPROJECT Polly
   Analysis/DependenceInfo.cpp
   Analysis/PolyhedralInfo.cpp
   Analysis/ScopDetection.cpp
add_llvm_pass_plugin(Polly
   Transform/ForwardOpTree.cpp
   Transform/DeLICM.cpp
   Transform/ZoneAlgo.cpp
   Transform/Simplify.cpp
   Transform/MaximalStaticExpansion.cpp
   Transform/RewriteByReferenceParameters.cpp
   Transform/ScopInliner.cpp
   ${POLLY_HEADER_FILES}
+
+  LINK_COMPONENTS
+  ${POLLY_COMPONENTS}
   )
 set_target_properties(obj.Polly PROPERTIES FOLDER "Polly")
 set_target_properties(Polly PROPERTIES FOLDER "Polly")
 
 if (MSVC_IDE OR XCODE)
   # Configure source groups for Polly source files. By default, in the IDE there
   # will be a source and include folder. In the source folder will be all the
   # source files in a flat list, and in the include folder will be all the
target_link_libraries(Polly PUBLIC
   ${ISL_TARGET}
 )
 
 # Additional dependencies for Polly-ACC.
 if (GPU_CODEGEN)
   target_link_libraries(Polly PUBLIC PollyPPCG)
 endif ()
 
-
-# Polly-ACC requires the NVPTX backend to work. Ask LLVM about its libraries.
-set(nvptx_libs)
-if (GPU_CODEGEN)
-  # This call emits an error if they NVPTX backend is not enable.
-  llvm_map_components_to_libnames(nvptx_libs NVPTX)
-endif ()
-
-if (LLVM_LINK_LLVM_DYLIB AND NOT LLVM_POLLY_LINK_INTO_TOOLS)
-  # The shlib/dylib contains all the LLVM components
-  # (including NVPTX is enabled) already. Adding them to target_link_libraries
-  # would cause them being twice in the address space
-  # (their LLVM*.a/so and their copies in libLLVM.so)
-  # which results in errors when the two instances try to register the same
-  # command-line switches.
-  target_link_libraries(Polly PUBLIC LLVM)
-else ()
-  target_link_libraries(Polly PUBLIC
-    LLVMSupport
-    LLVMCore
-    LLVMScalarOpts
-    LLVMInstCombine
-    LLVMTransformUtils
-    LLVMAnalysis
-    LLVMipo
-    LLVMMC
-    LLVMPasses
-    LLVMLinker
-    LLVMIRReader
-    ${nvptx_libs}
-    # The libraries below are required for darwin: http://PR26392
-    LLVMBitReader
-    LLVMMCParser
-    LLVMObject
-    LLVMProfileData
-    LLVMTarget
-    LLVMVectorize
-    )
-
+if (NOT LLVM_LINK_LLVM_DYLIB AND NOT LLVM_POLLY_LINK_INTO_TOOLS)
     # Polly-ACC requires the NVPTX target to be present in the executable it is linked to
     set_property(TARGET bugpoint APPEND PROPERTY LINK_LIBRARIES LLVMTarget)
 endif ()
 
 # Create a loadable module Polly.so that can be loaded using
 # LLVM's/clang's "-load" option.
 if (MSVC)
   # Add dummy target, because loadable modules are not supported on Windows