[llvm] r342148 - Renovate CMake files in the `llvm-(cfi-verify|exegesis|mca)` tools.
Volodymyr Sapsai via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 13 12:54:44 PDT 2018
I suggest to revert "r342150 - [cmake] Fix a unittest when `LLVM_LINK_LLVM_DYLIB` is requested.” as well. It causes "LLVM-Unit :: Passes/./PluginsTests/PluginsTests.LoadPlugin” to fail with
> Assertion failed: (count_if(RegisteredOptionCategories, [cat](const OptionCategory *Category) { return cat->getName() == Category->getName(); }) == 0 && "Duplicate option categories"), function registerCategory, file llvm-project/llvm/lib/Support/CommandLine.cpp, line 282.
Thanks,
Volodymyr
> On Sep 13, 2018, at 09:39, Sanjay Patel via llvm-commits <llvm-commits at lists.llvm.org> wrote:
>
> I think this should be reverted because it's breaking all the bots with errors like this:
> /Users/buildslave/as-bldslv9/lld-x86_64-darwin13/llvm.src/include/llvm/IR/Attributes.h:74:14: fatal error: 'llvm/IR/Attributes.inc' file not found
> #include "llvm/IR/Attributes.inc"
>
>
> On Thu, Sep 13, 2018 at 10:33 AM, Roman Lebedev via llvm-commits <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
> It is a good idea to actually supply a commit message.
> Why is this change needed? There is no reasoning/explanation at all.
>
> On Thu, Sep 13, 2018 at 7:15 PM, Richard Diamond via llvm-commits
> <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
> > Author: diamond
> > Date: Thu Sep 13 09:15:03 2018
> > New Revision: 342148
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=342148&view=rev <http://llvm.org/viewvc/llvm-project?rev=342148&view=rev>
> > Log:
> > Renovate CMake files in the `llvm-(cfi-verify|exegesis|mca)` tools.
> >
> > Modified:
> > llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt
> > llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
> > llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
> > llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt
> > llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt
> >
> > Modified: llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff>
> > ==============================================================================
> > --- llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt (original)
> > +++ llvm/trunk/tools/llvm-cfi-verify/lib/CMakeLists.txt Thu Sep 13 09:15:03 2018
> > @@ -1,13 +1,12 @@
> > -add_library(LLVMCFIVerify
> > - STATIC
> > +add_llvm_library(LLVMCFIVerify
> > FileAnalysis.cpp
> > FileAnalysis.h
> > GraphBuilder.cpp
> > GraphBuilder.h
> > - )
> >
> > -llvm_update_compile_flags(LLVMCFIVerify)
> > -llvm_map_components_to_libnames(libs
> > + STATIC
> > +
> > + LINK_COMPONENTS
> > DebugInfoDWARF
> > MC
> > MCParser
> > @@ -15,5 +14,3 @@ llvm_map_components_to_libnames(libs
> > Support
> > Symbolize
> > )
> > -target_link_libraries(LLVMCFIVerify ${libs})
> > -set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
> >
> > Modified: llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff>
> > ==============================================================================
> > --- llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt (original)
> > +++ llvm/trunk/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt Thu Sep 13 09:15:03 2018
> > @@ -3,16 +3,12 @@ include_directories(
> > ${LLVM_BINARY_DIR}/lib/Target/AArch64
> > )
> >
> > -add_library(LLVMExegesisAArch64
> > - STATIC
> > +add_llvm_library(LLVMExegesisAArch64
> > Target.cpp
> > - )
> >
> > -llvm_update_compile_flags(LLVMExegesisAArch64)
> > -llvm_map_components_to_libnames(libs
> > + STATIC
> > +
> > + LINK_COMPONENTS
> > AArch64
> > Exegesis
> > )
> > -
> > -target_link_libraries(LLVMExegesisAArch64 ${libs})
> > -set_target_properties(LLVMExegesisAArch64 PROPERTIES FOLDER "Libraries")
> >
> > Modified: llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff>
> > ==============================================================================
> > --- llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt (original)
> > +++ llvm/trunk/tools/llvm-exegesis/lib/CMakeLists.txt Thu Sep 13 09:15:03 2018
> > @@ -7,8 +7,12 @@ if (LLVM_TARGETS_TO_BUILD MATCHES "AArch
> > set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} AArch64" PARENT_SCOPE)
> > endif()
> >
> > -add_library(LLVMExegesis
> > - STATIC
> > +set(libs)
> > +if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)
> > + list(APPEND libs pfm)
> > +endif()
> > +
> > +add_llvm_library(LLVMExegesis
> > Analysis.cpp
> > Assembler.cpp
> > BenchmarkResult.cpp
> > @@ -22,10 +26,10 @@ add_library(LLVMExegesis
> > SnippetGenerator.cpp
> > Target.cpp
> > Uops.cpp
> > - )
> >
> > -llvm_update_compile_flags(LLVMExegesis)
> > -llvm_map_components_to_libnames(libs
> > + STATIC
> > +
> > + LINK_COMPONENTS
> > Analysis
> > CodeGen
> > Core
> > @@ -37,11 +41,6 @@ llvm_map_components_to_libnames(libs
> > Object
> > ObjectYAML
> > Support
> > - )
> >
> > -if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)
> > - list(APPEND libs pfm)
> > -endif()
> > -
> > -target_link_libraries(LLVMExegesis ${libs})
> > -set_target_properties(LLVMExegesis PROPERTIES FOLDER "Libraries")
> > + LINK_LIBS ${libs}
> > + )
> >
> > Modified: llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff>
> > ==============================================================================
> > --- llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt (original)
> > +++ llvm/trunk/tools/llvm-exegesis/lib/X86/CMakeLists.txt Thu Sep 13 09:15:03 2018
> > @@ -3,16 +3,12 @@ include_directories(
> > ${LLVM_BINARY_DIR}/lib/Target/X86
> > )
> >
> > -add_library(LLVMExegesisX86
> > - STATIC
> > +add_llvm_library(LLVMExegesisX86
> > Target.cpp
> > - )
> >
> > -llvm_update_compile_flags(LLVMExegesisX86)
> > -llvm_map_components_to_libnames(libs
> > + STATIC
> > +
> > + LINK_COMPONENTS
> > X86
> > Exegesis
> > )
> > -
> > -target_link_libraries(LLVMExegesisX86 ${libs})
> > -set_target_properties(LLVMExegesisX86 PROPERTIES FOLDER "Libraries")
> >
> > Modified: llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt
> > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff <http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt?rev=342148&r1=342147&r2=342148&view=diff>
> > ==============================================================================
> > --- llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt (original)
> > +++ llvm/trunk/tools/llvm-mca/lib/CMakeLists.txt Thu Sep 13 09:15:03 2018
> > @@ -1,7 +1,6 @@
> > include_directories(${LLVM_MCA_SOURCE_DIR}/include)
> >
> > -add_library(LLVMMCA
> > - STATIC
> > +add_llvm_library(LLVMMCA
> > Context.cpp
> > HWEventListener.cpp
> > HardwareUnits/HardwareUnit.cpp
> > @@ -20,14 +19,11 @@ add_library(LLVMMCA
> > Stages/RetireStage.cpp
> > Stages/Stage.cpp
> > Support.cpp
> > - )
> >
> > -llvm_update_compile_flags(LLVMMCA)
> > -llvm_map_components_to_libnames(libs
> > + STATIC
> > +
> > + LINK_COMPONENTS
> > CodeGen
> > MC
> > Support
> > )
> > -
> > -target_link_libraries(LLVMMCA ${libs})
> > -set_target_properties(LLVMMCA PROPERTIES FOLDER "Libraries")
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180913/9027f060/attachment.html>
More information about the llvm-commits
mailing list