[llvm-commits] [PATCH 6/6] Build script changes for R600/SI Codegen v3
Tom Stellard
tstellar at gmail.com
Mon May 14 10:24:51 PDT 2012
---
CMakeLists.txt | 1 +
autoconf/configure.ac | 5 +++--
configure | 8 +++++---
lib/Target/AMDIL/CMakeLists.txt | 7 +------
lib/Target/LLVMBuild.txt | 2 +-
projects/sample/autoconf/configure.ac | 5 +++--
projects/sample/configure | 7 ++++---
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f4dea9..b858cb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,7 @@ set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples)
set(LLVM_LIBDIR_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)" )
set(LLVM_ALL_TARGETS
+ AMDIL
ARM
CellSPU
CppBackend
diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 0f488ab..c2005cb 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -630,13 +630,13 @@ TARGETS_TO_BUILD=""
AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-targets],
[Build specific host targets: all or target1,target2,... Valid targets are:
host, x86, x86_64, sparc, powerpc, arm, mips, spu, hexagon,
- xcore, msp430, ptx, nvptx, and cpp (default=all)]),,
+ xcore, msp430, ptx, nvptx, r600, and cpp (default=all)]),,
enableval=all)
if test "$enableval" = host-only ; then
enableval=host
fi
case "$enableval" in
- all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 CppBackend MBlaze PTX NVPTX Hexagon" ;;
+ all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 CppBackend MBlaze PTX NVPTX Hexagon AMDIL" ;;
*)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do
case "$a_target" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -654,6 +654,7 @@ case "$enableval" in
mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;;
ptx) TARGETS_TO_BUILD="PTX $TARGETS_TO_BUILD" ;;
nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;;
+ r600) TARGETS_TO_BUILD="AMDIL $TARGETS_TO_BUILD" ;;
host) case "$llvm_cv_target_arch" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
diff --git a/configure b/configure
index 348436f..788a035 100755
--- a/configure
+++ b/configure
@@ -1418,7 +1418,8 @@ Optional Features:
--enable-targets Build specific host targets: all or
target1,target2,... Valid targets are: host, x86,
x86_64, sparc, powerpc, arm, mips, spu, hexagon,
- xcore, msp430, ptx, nvptx, and cpp (default=all)
+ xcore, msp430, ptx, nvptx, r600, and cpp
+ (default=all)
--enable-bindings Build specific language bindings:
all,auto,none,{binding-name} (default=auto)
--enable-libffi Check for the presence of libffi (default is NO)
@@ -5311,7 +5312,7 @@ if test "$enableval" = host-only ; then
enableval=host
fi
case "$enableval" in
- all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 CppBackend MBlaze PTX NVPTX Hexagon" ;;
+ all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 CppBackend MBlaze PTX NVPTX Hexagon AMDIL" ;;
*)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do
case "$a_target" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -5329,6 +5330,7 @@ case "$enableval" in
mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;;
ptx) TARGETS_TO_BUILD="PTX $TARGETS_TO_BUILD" ;;
nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;;
+ r600) TARGETS_TO_BUILD="AMDIL $TARGETS_TO_BUILD" ;;
host) case "$llvm_cv_target_arch" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -10324,7 +10326,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10327 "configure"
+#line 10329 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git a/lib/Target/AMDIL/CMakeLists.txt b/lib/Target/AMDIL/CMakeLists.txt
index dac9fe0..b325a72 100644
--- a/lib/Target/AMDIL/CMakeLists.txt
+++ b/lib/Target/AMDIL/CMakeLists.txt
@@ -23,20 +23,16 @@ add_llvm_target(AMDILCodeGen
AMDILISelDAGToDAG.cpp
AMDILISelLowering.cpp
AMDILMachinePeephole.cpp
- AMDILMCCodeEmitter.cpp
AMDILNIDevice.cpp
AMDILPeepholeOptimizer.cpp
AMDILRegisterInfo.cpp
AMDILSIDevice.cpp
AMDILSubtarget.cpp
AMDILTargetMachine.cpp
- AMDILUtilityFunctions.cpp
AMDGPUTargetMachine.cpp
AMDGPUISelLowering.cpp
AMDGPUConvertToISA.cpp
AMDGPULowerInstructions.cpp
- AMDGPULowerShaderInstructions.cpp
- AMDGPUReorderPreloadInstructions.cpp
AMDGPUInstrInfo.cpp
AMDGPURegisterInfo.cpp
AMDGPUUtil.cpp
@@ -45,13 +41,12 @@ add_llvm_target(AMDILCodeGen
R600ISelLowering.cpp
R600KernelParameters.cpp
R600LowerInstructions.cpp
- R600LowerShaderInstructions.cpp
+ R600MachineFunctionInfo.cpp
R600RegisterInfo.cpp
SIAssignInterpRegs.cpp
SICodeEmitter.cpp
SIInstrInfo.cpp
SIISelLowering.cpp
- SILowerShaderInstructions.cpp
SIMachineFunctionInfo.cpp
SIPropagateImmReads.cpp
SIRegisterInfo.cpp
diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt
index 045ab9e..469ee54 100644
--- a/lib/Target/LLVMBuild.txt
+++ b/lib/Target/LLVMBuild.txt
@@ -16,7 +16,7 @@
;===------------------------------------------------------------------------===;
[common]
-subdirectories = ARM CellSPU CppBackend Hexagon MBlaze MSP430 NVPTX Mips PTX PowerPC Sparc X86 XCore
+subdirectories = AMDIL ARM CellSPU CppBackend Hexagon MBlaze MSP430 NVPTX Mips PTX PowerPC Sparc X86 XCore
; This is a special group whose required libraries are extended (by llvm-build)
; with the best execution engine (the native JIT, if available, or the
diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac
index e5a4b35..ede19b4 100644
--- a/projects/sample/autoconf/configure.ac
+++ b/projects/sample/autoconf/configure.ac
@@ -569,13 +569,13 @@ TARGETS_TO_BUILD=""
AC_ARG_ENABLE([targets],AS_HELP_STRING([--enable-targets],
[Build specific host targets: all or target1,target2,... Valid targets are:
host, x86, x86_64, sparc, powerpc, arm, mips, spu, hexagon,
- xcore, msp430, ptx, nvptx, cbe, and cpp (default=all)]),,
+ xcore, msp430, ptx, nvptx, cbe, r600, and cpp (default=all)]),,
enableval=all)
if test "$enableval" = host-only ; then
enableval=host
fi
case "$enableval" in
- all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 Hexagon CppBackend MBlaze PTX NVPTX" ;;
+ all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 Hexagon CppBackend MBlaze PTX NVPTX AMDIL" ;;
*)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do
case "$a_target" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -592,6 +592,7 @@ case "$enableval" in
mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;;
ptx) TARGETS_TO_BUILD="PTX $TARGETS_TO_BUILD" ;;
nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;;
+ r600) TARGETS_TO_BUILD="AMDIL $TARGETS_TO_BUILD" ;;
host) case "$llvm_cv_target_arch" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
diff --git a/projects/sample/configure b/projects/sample/configure
index a54e153..4e1b18b 100755
--- a/projects/sample/configure
+++ b/projects/sample/configure
@@ -1402,7 +1402,7 @@ Optional Features:
--enable-targets Build specific host targets: all or
target1,target2,... Valid targets are: host, x86,
x86_64, sparc, powerpc, arm, mips, spu, hexagon,
- xcore, msp430, ptx, nvptx, cbe, and cpp
+ xcore, msp430, ptx, nvptx, cbe, r600, and cpp
(default=all)
--enable-bindings Build specific language bindings:
all,auto,none,{binding-name} (default=auto)
@@ -5258,7 +5258,7 @@ if test "$enableval" = host-only ; then
enableval=host
fi
case "$enableval" in
- all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 Hexagon CppBackend MBlaze PTX NVPTX" ;;
+ all) TARGETS_TO_BUILD="X86 Sparc PowerPC ARM Mips CellSPU XCore MSP430 Hexagon CppBackend MBlaze PTX NVPTX AMDIL" ;;
*)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do
case "$a_target" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -5275,6 +5275,7 @@ case "$enableval" in
mblaze) TARGETS_TO_BUILD="MBlaze $TARGETS_TO_BUILD" ;;
ptx) TARGETS_TO_BUILD="PTX $TARGETS_TO_BUILD" ;;
nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;;
+ r600) TARGETS_TO_BUILD="AMDIL $TARGETS_TO_BUILD" ;;
host) case "$llvm_cv_target_arch" in
x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -10313,7 +10314,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10316 "configure"
+#line 10317 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
--
1.7.3.4
More information about the llvm-commits
mailing list