CMake: Reflected changes on source file structure. New plugin support

for llvmc2 incomplete.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@57076 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 36 insertions, 32 deletions

diff --git a/lib/CodeGen/CMakeLists.txt b/lib/CodeGen/CMakeLists.txt
index 5d15746..757d3ed 100644
--- a/lib/CodeGen/CMakeLists.txt
+++ b/lib/CodeGen/CMakeLists.txt
@@ -26,6 +26,7 @@ add_llvm_library(LLVMCodeGen
   MachineRegisterInfo.cpp
   MachineSink.cpp
   OcamlGC.cpp
+  PBQP.cpp
   PHIElimination.cpp
   Passes.cpp
   PostRASchedulerList.cpp
@@ -34,6 +35,7 @@ add_llvm_library(LLVMCodeGen
   RegAllocBigBlock.cpp
   RegAllocLinearScan.cpp
   RegAllocLocal.cpp
+  RegAllocPBQP.cpp
   RegAllocSimple.cpp
   RegisterCoalescer.cpp
   RegisterScavenging.cpp
diff --git a/tools/llvmc2/CMakeLists.txt b/tools/llvmc2/CMakeLists.txt
index 7e8211f..f820419 100644
--- a/tools/llvmc2/CMakeLists.txt
+++ b/tools/llvmc2/CMakeLists.txt
@@ -1,33 +1,4 @@
-set(LLVM_LINK_COMPONENTS support system)
-set(LLVM_REQUIRES_EH 1)
+add_subdirectory(driver)
 
-macro(tgen ofn)
-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
-    COMMAND tblgen ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${llvm_include_path} ${CMAKE_CURRENT_SOURCE_DIR}/Graph.td -o ${ofn}
-    DEPENDS
-    tblgen
-    ${CMAKE_CURRENT_SOURCE_DIR}/Common.td
-    ${CMAKE_CURRENT_SOURCE_DIR}/Graph.td
-    ${CMAKE_CURRENT_SOURCE_DIR}/Tools.td
-    COMMENT "Building ${ofn}..."
-    )
-endmacro(tgen ofn)
-
-tgen(AutoGenerated.inc -gen-llvmc)
-
-add_custom_target(AutoGenerated_ct echo Tablegenning
-  DEPENDS
-  ${CMAKE_CURRENT_BINARY_DIR}/AutoGenerated.inc
-  )
-
-include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
-
-add_llvm_tool(llvmc2
-  Action.cpp
-  AutoGenerated.cpp
-  CompilationGraph.cpp
-  Plugin.cpp
-  llvmc.cpp
-  )
-
-add_dependencies(llvmc2 AutoGenerated_ct)
+# TODO: support plugins and user-configured builds.
+# See ./doc/LLVMC-Reference.rst "Customizing LLVMC: the compilation graph"
diff --git a/tools/llvmc2/driver/CMakeLists.txt b/tools/llvmc2/driver/CMakeLists.txt
new file mode 100644
index 0000000..057ef40
--- /dev/null
+++ b/tools/llvmc2/driver/CMakeLists.txt
@@ -0,0 +1,31 @@
+set(LLVM_LINK_COMPONENTS support system)
+set(LLVM_REQUIRES_EH 1)
+
+macro(tgen ofn)
+  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}
+    COMMAND tblgen ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} -I ${CMAKE_SOURCE_DIR}/lib/Target -I ${llvm_include_path} ${CMAKE_CURRENT_SOURCE_DIR}/Graph.td -o ${ofn}
+    DEPENDS
+    tblgen
+    ${llvm_include_path}/llvm/CompilerDriver/Common.td
+    ${llvm_include_path}/llvm/CompilerDriver/Tools.td
+    COMMENT "Building ${ofn}..."
+    )
+endmacro(tgen ofn)
+
+# tgen(AutoGenerated.inc -gen-llvmc)
+
+# add_custom_target(AutoGenerated_ct echo Tablegenning
+#   DEPENDS
+#   ${CMAKE_CURRENT_BINARY_DIR}/AutoGenerated.inc
+#   )
+
+include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
+
+add_llvm_tool(llvmc2
+  Action.cpp
+  CompilationGraph.cpp
+  llvmc.cpp
+  Plugin.cpp
+  )
+
+# add_dependencies(llvmc2 AutoGenerated_ct)