[llvm] 10c1d29 - Revert "Renovate CMake files in the `llvm-exegesis` tool."
Jameson Nash via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 8 16:12:33 PST 2021
Author: Jameson Nash
Date: 2021-02-08T19:12:08-05:00
New Revision: 10c1d290d92fe435634051a4ad47f76c0f948796
URL: https://github.com/llvm/llvm-project/commit/10c1d290d92fe435634051a4ad47f76c0f948796
DIFF: https://github.com/llvm/llvm-project/commit/10c1d290d92fe435634051a4ad47f76c0f948796.diff
LOG: Revert "Renovate CMake files in the `llvm-exegesis` tool."
This reverts commit 549a1e2e59508d4aeaf9a93912b479798954bd5e.
I see some buildbot failures, so reverting while I look into them.
Added:
Modified:
llvm/tools/llvm-exegesis/CMakeLists.txt
llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
llvm/tools/llvm-exegesis/lib/CMakeLists.txt
llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt
llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt
llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
llvm/utils/TableGen/GlobalISel/CMakeLists.txt
Removed:
################################################################################
diff --git a/llvm/tools/llvm-exegesis/CMakeLists.txt b/llvm/tools/llvm-exegesis/CMakeLists.txt
index f1e17844c486..0575f2a06bb7 100644
--- a/llvm/tools/llvm-exegesis/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/CMakeLists.txt
@@ -1,5 +1,4 @@
set(LLVM_LINK_COMPONENTS
- MC
MCParser
Support
native
@@ -8,9 +7,6 @@ set(LLVM_LINK_COMPONENTS
add_llvm_tool(llvm-exegesis
DISABLE_LLVM_LINK_LLVM_DYLIB
llvm-exegesis.cpp
-
- DEPENDS
- intrinsics_gen
)
add_subdirectory(lib)
diff --git a/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
index bac77efb6c8f..a251b8ff683e 100644
--- a/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/AArch64/CMakeLists.txt
@@ -3,17 +3,16 @@ include_directories(
${LLVM_BINARY_DIR}/lib/Target/AArch64
)
-set(LLVM_LINK_COMPONENTS
- AArch64
- Exegesis
- Core
- )
-
-add_llvm_library(LLVMExegesisAArch64
- DISABLE_LLVM_LINK_LLVM_DYLIB
+add_library(LLVMExegesisAArch64
STATIC
Target.cpp
+ )
- DEPENDS
- intrinsics_gen
+llvm_update_compile_flags(LLVMExegesisAArch64)
+llvm_map_components_to_libnames(libs
+ AArch64
+ Exegesis
)
+
+target_link_libraries(LLVMExegesisAArch64 ${libs})
+set_target_properties(LLVMExegesisAArch64 PROPERTIES FOLDER "Libraries")
diff --git a/llvm/tools/llvm-exegesis/lib/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
index 2ca0ce4f905a..48896d4a1b36 100644
--- a/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/CMakeLists.txt
@@ -19,29 +19,7 @@ endif()
set(LLVM_EXEGESIS_TARGETS "${LLVM_EXEGESIS_TARGETS} ${TARGETS_TO_APPEND}" PARENT_SCOPE)
-set(LLVM_LINK_COMPONENTS
- Analysis
- CodeGen
- Core
- ExecutionEngine
- GlobalISel
- MC
- MCDisassembler
- MCJIT
- MCParser
- Object
- ObjectYAML
- RuntimeDyld
- Support
- )
-
-set(libs)
-if(LLVM_ENABLE_LIBPFM AND HAVE_LIBPFM)
- list(APPEND libs pfm)
-endif()
-
-add_llvm_library(LLVMExegesis
- DISABLE_LLVM_LINK_LLVM_DYLIB
+add_library(LLVMExegesis
STATIC
Analysis.cpp
Assembler.cpp
@@ -64,9 +42,28 @@ add_llvm_library(LLVMExegesis
SnippetRepetitor.cpp
Target.cpp
UopsBenchmarkRunner.cpp
+ )
- LINK_LIBS ${libs}
-
- DEPENDS
- intrinsics_gen
+llvm_update_compile_flags(LLVMExegesis)
+llvm_map_components_to_libnames(libs
+ Analysis
+ CodeGen
+ Core
+ ExecutionEngine
+ GlobalISel
+ MC
+ MCDisassembler
+ MCJIT
+ MCParser
+ Object
+ ObjectYAML
+ RuntimeDyld
+ 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")
diff --git a/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt
index 5ff716ab421c..79bd563a6207 100644
--- a/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/Mips/CMakeLists.txt
@@ -3,17 +3,16 @@ include_directories(
${LLVM_BINARY_DIR}/lib/Target/Mips
)
-set(LLVM_LINK_COMPONENTS
- Mips
- Exegesis
- Core
- )
-
-add_llvm_library(LLVMExegesisMips
- DISABLE_LLVM_LINK_LLVM_DYLIB
+add_library(LLVMExegesisMips
STATIC
Target.cpp
+ )
- DEPENDS
- intrinsics_gen
+llvm_update_compile_flags(LLVMExegesisMips)
+llvm_map_components_to_libnames(libs
+ Mips
+ Exegesis
)
+
+target_link_libraries(LLVMExegesisMips ${libs})
+set_target_properties(LLVMExegesisMips PROPERTIES FOLDER "Libraries")
diff --git a/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt
index 9d54d51b1840..89e33437952e 100644
--- a/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/PowerPC/CMakeLists.txt
@@ -3,17 +3,16 @@ include_directories(
${LLVM_BINARY_DIR}/lib/Target/PowerPC
)
-set(LLVM_LINK_COMPONENTS
- PowerPC
- Exegesis
- Core
- )
-
-add_llvm_library(LLVMExegesisPowerPC
- DISABLE_LLVM_LINK_LLVM_DYLIB
+add_library(LLVMExegesisPowerPC
STATIC
Target.cpp
+ )
- DEPENDS
- intrinsics_gen
+llvm_update_compile_flags(LLVMExegesisPowerPC)
+llvm_map_components_to_libnames(libs
+ PowerPC
+ Exegesis
)
+
+target_link_libraries(LLVMExegesisPowerPC ${libs})
+set_target_properties(LLVMExegesisPowerPC PROPERTIES FOLDER "Libraries")
diff --git a/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt b/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
index f8cada7d13da..ce3bbd5908a8 100644
--- a/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
+++ b/llvm/tools/llvm-exegesis/lib/X86/CMakeLists.txt
@@ -3,18 +3,17 @@ include_directories(
${LLVM_BINARY_DIR}/lib/Target/X86
)
-set(LLVM_LINK_COMPONENTS
- X86
- Exegesis
- Core
- )
-
-add_llvm_library(LLVMExegesisX86
- DISABLE_LLVM_LINK_LLVM_DYLIB
+add_library(LLVMExegesisX86
STATIC
Target.cpp
X86Counter.cpp
+ )
- DEPENDS
- intrinsics_gen
+llvm_update_compile_flags(LLVMExegesisX86)
+llvm_map_components_to_libnames(libs
+ X86
+ Exegesis
)
+
+target_link_libraries(LLVMExegesisX86 ${libs})
+set_target_properties(LLVMExegesisX86 PROPERTIES FOLDER "Libraries")
diff --git a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
index c23ef6742f32..25fff72d3dcf 100644
--- a/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
+++ b/llvm/utils/TableGen/GlobalISel/CMakeLists.txt
@@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS
TableGen
)
-add_llvm_library(LLVMTableGenGlobalISel STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
+llvm_add_library(LLVMTableGenGlobalISel STATIC DISABLE_LLVM_LINK_LLVM_DYLIB
CodeExpander.cpp
GIMatchDag.cpp
GIMatchDagEdge.cpp
More information about the llvm-commits
mailing list