AMDGPU: Rename backend to R600

109 files changed, 51 insertions, 39 deletions

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 7715531a33..1330c36531 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -751,6 +751,11 @@ AC_ARG_ENABLE([experimental-targets],AS_HELP_STRING([--enable-experimental-targe
 
 if test ${enableval} != "disable"
 then
+  if test ${enableval} = "AMDGPU"
+  then
+    AC_MSG_ERROR([The AMDGPU target has been renamed to R600, please reconfigure with --enable-experimental-targets=R600])
+    enableval="R600"
+  fi
   TARGETS_TO_BUILD="$enableval $TARGETS_TO_BUILD"
 fi
 
diff --git a/configure b/configure
index 4fa0705491..02012b9256 100755
--- a/configure
+++ b/configure
@@ -5473,6 +5473,13 @@ fi
 
 if test ${enableval} != "disable"
 then
+  if test ${enableval} = "AMDGPU"
+  then
+    { { echo "$as_me:$LINENO: error: The AMDGPU target has been renamed to R600, please reconfigure with --enable-experimental-targets=R600" >&5
+echo "$as_me: error: The AMDGPU target has been renamed to R600, please reconfigure with --enable-experimental-targets=R600" >&2;}
+   { (exit 1); exit 1; }; }
+    enableval="R600"
+  fi
   TARGETS_TO_BUILD="$enableval $TARGETS_TO_BUILD"
 fi
 
@@ -10316,7 +10323,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10317 "configure"
+#line 10326 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt
index 97c8796e3c..84c4111b2e 100644
--- a/lib/Target/LLVMBuild.txt
+++ b/lib/Target/LLVMBuild.txt
@@ -16,7 +16,7 @@
 ;===------------------------------------------------------------------------===;
 
 [common]
-subdirectories = AMDGPU ARM CellSPU CppBackend Hexagon MBlaze MSP430 NVPTX Mips PowerPC Sparc X86 XCore
+subdirectories = ARM CellSPU CppBackend Hexagon MBlaze MSP430 NVPTX Mips PowerPC R600 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/lib/Target/AMDGPU/AMDGPU.h b/lib/Target/R600/AMDGPU.h
index 0f5125d39b..0f5125d39b 100644
--- a/lib/Target/AMDGPU/AMDGPU.h
+++ b/lib/Target/R600/AMDGPU.h
diff --git a/lib/Target/AMDGPU/AMDGPU.td b/lib/Target/R600/AMDGPU.td
index 40f474161a..40f474161a 100644
--- a/lib/Target/AMDGPU/AMDGPU.td
+++ b/lib/Target/R600/AMDGPU.td
diff --git a/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp b/lib/Target/R600/AMDGPUAsmPrinter.cpp
index 4d796d4212..4553c4556c 100644
--- a/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
+++ b/lib/Target/R600/AMDGPUAsmPrinter.cpp
@@ -33,7 +33,7 @@ static AsmPrinter *createAMDGPUAsmPrinterPass(TargetMachine &tm,
   return new AMDGPUAsmPrinter(tm, Streamer);
 }
 
-extern "C" void LLVMInitializeAMDGPUAsmPrinter() {
+extern "C" void LLVMInitializeR600AsmPrinter() {
   TargetRegistry::RegisterAsmPrinter(TheAMDGPUTarget, createAMDGPUAsmPrinterPass);
 }
 
diff --git a/lib/Target/AMDGPU/AMDGPUAsmPrinter.h b/lib/Target/R600/AMDGPUAsmPrinter.h
index 3812282b17..3812282b17 100644
--- a/lib/Target/AMDGPU/AMDGPUAsmPrinter.h
+++ b/lib/Target/R600/AMDGPUAsmPrinter.h
diff --git a/lib/Target/AMDGPU/AMDGPUCodeEmitter.h b/lib/Target/R600/AMDGPUCodeEmitter.h
index 84f3588496..84f3588496 100644
--- a/lib/Target/AMDGPU/AMDGPUCodeEmitter.h
+++ b/lib/Target/R600/AMDGPUCodeEmitter.h
diff --git a/lib/Target/AMDGPU/AMDGPUConvertToISA.cpp b/lib/Target/R600/AMDGPUConvertToISA.cpp
index 50297d1f60..50297d1f60 100644
--- a/lib/Target/AMDGPU/AMDGPUConvertToISA.cpp
+++ b/lib/Target/R600/AMDGPUConvertToISA.cpp
diff --git a/lib/Target/AMDGPU/AMDGPUISelLowering.cpp b/lib/Target/R600/AMDGPUISelLowering.cpp
index 473dac4ddc..473dac4ddc 100644
--- a/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
+++ b/lib/Target/R600/AMDGPUISelLowering.cpp
diff --git a/lib/Target/AMDGPU/AMDGPUISelLowering.h b/lib/Target/R600/AMDGPUISelLowering.h
index c7abaf69b4..c7abaf69b4 100644
--- a/lib/Target/AMDGPU/AMDGPUISelLowering.h
+++ b/lib/Target/R600/AMDGPUISelLowering.h
diff --git a/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp b/lib/Target/R600/AMDGPUInstrInfo.cpp
index e42a46d839..e42a46d839 100644
--- a/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
+++ b/lib/Target/R600/AMDGPUInstrInfo.cpp
diff --git a/lib/Target/AMDGPU/AMDGPUInstrInfo.h b/lib/Target/R600/AMDGPUInstrInfo.h
index 32ac691fe0..32ac691fe0 100644
--- a/lib/Target/AMDGPU/AMDGPUInstrInfo.h
+++ b/lib/Target/R600/AMDGPUInstrInfo.h
diff --git a/lib/Target/AMDGPU/AMDGPUInstrInfo.td b/lib/Target/R600/AMDGPUInstrInfo.td
index 96368e8541..96368e8541 100644
--- a/lib/Target/AMDGPU/AMDGPUInstrInfo.td
+++ b/lib/Target/R600/AMDGPUInstrInfo.td
diff --git a/lib/Target/AMDGPU/AMDGPUInstructions.td b/lib/Target/R600/AMDGPUInstructions.td
index e634d20b61..e634d20b61 100644
--- a/lib/Target/AMDGPU/AMDGPUInstructions.td
+++ b/lib/Target/R600/AMDGPUInstructions.td
diff --git a/lib/Target/AMDGPU/AMDGPUIntrinsics.td b/lib/Target/R600/AMDGPUIntrinsics.td
index 2ba2d4b90d..2ba2d4b90d 100644
--- a/lib/Target/AMDGPU/AMDGPUIntrinsics.td
+++ b/lib/Target/R600/AMDGPUIntrinsics.td
diff --git a/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp b/lib/Target/R600/AMDGPUMCInstLower.cpp
index 32275a2b04..32275a2b04 100644
--- a/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp
+++ b/lib/Target/R600/AMDGPUMCInstLower.cpp
diff --git a/lib/Target/AMDGPU/AMDGPUMCInstLower.h b/lib/Target/R600/AMDGPUMCInstLower.h
index d7d538e925..d7d538e925 100644
--- a/lib/Target/AMDGPU/AMDGPUMCInstLower.h
+++ b/lib/Target/R600/AMDGPUMCInstLower.h
diff --git a/lib/Target/AMDGPU/AMDGPURegisterInfo.cpp b/lib/Target/R600/AMDGPURegisterInfo.cpp
index eeafec898d..eeafec898d 100644
--- a/lib/Target/AMDGPU/AMDGPURegisterInfo.cpp
+++ b/lib/Target/R600/AMDGPURegisterInfo.cpp
diff --git a/lib/Target/AMDGPU/AMDGPURegisterInfo.h b/lib/Target/R600/AMDGPURegisterInfo.h
index 76ee7ae06a..76ee7ae06a 100644
--- a/lib/Target/AMDGPU/AMDGPURegisterInfo.h
+++ b/lib/Target/R600/AMDGPURegisterInfo.h
diff --git a/lib/Target/AMDGPU/AMDGPURegisterInfo.td b/lib/Target/R600/AMDGPURegisterInfo.td
index 8181e023aa..8181e023aa 100644
--- a/lib/Target/AMDGPU/AMDGPURegisterInfo.td
+++ b/lib/Target/R600/AMDGPURegisterInfo.td
diff --git a/lib/Target/AMDGPU/AMDGPUStructurizeCFG.cpp b/lib/Target/R600/AMDGPUStructurizeCFG.cpp
index 22338b5bf7..22338b5bf7 100644
--- a/lib/Target/AMDGPU/AMDGPUStructurizeCFG.cpp
+++ b/lib/Target/R600/AMDGPUStructurizeCFG.cpp
diff --git a/lib/Target/AMDGPU/AMDGPUSubtarget.cpp b/lib/Target/R600/AMDGPUSubtarget.cpp
index 0f356a1c3f..0f356a1c3f 100644
--- a/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
+++ b/lib/Target/R600/AMDGPUSubtarget.cpp
diff --git a/lib/Target/AMDGPU/AMDGPUSubtarget.h b/lib/Target/R600/AMDGPUSubtarget.h
index cab7884ea3..cab7884ea3 100644
--- a/lib/Target/AMDGPU/AMDGPUSubtarget.h
+++ b/lib/Target/R600/AMDGPUSubtarget.h
diff --git a/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/lib/Target/R600/AMDGPUTargetMachine.cpp
index 098d42e79a..d09dc2efff 100644
--- a/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
+++ b/lib/Target/R600/AMDGPUTargetMachine.cpp
@@ -34,7 +34,7 @@
 
 using namespace llvm;
 
-extern "C" void LLVMInitializeAMDGPUTarget() {
+extern "C" void LLVMInitializeR600Target() {
   // Register the target
   RegisterTargetMachine<AMDGPUTargetMachine> X(TheAMDGPUTarget);
 }
diff --git a/lib/Target/AMDGPU/AMDGPUTargetMachine.h b/lib/Target/R600/AMDGPUTargetMachine.h
index 399e55c8ad..399e55c8ad 100644
--- a/lib/Target/AMDGPU/AMDGPUTargetMachine.h
+++ b/lib/Target/R600/AMDGPUTargetMachine.h
diff --git a/lib/Target/AMDGPU/AMDIL.h b/lib/Target/R600/AMDIL.h
index 4e577dc234..4e577dc234 100644
--- a/lib/Target/AMDGPU/AMDIL.h
+++ b/lib/Target/R600/AMDIL.h
diff --git a/lib/Target/AMDGPU/AMDIL7XXDevice.cpp b/lib/Target/R600/AMDIL7XXDevice.cpp
index ea6ac34f57..ea6ac34f57 100644
--- a/lib/Target/AMDGPU/AMDIL7XXDevice.cpp
+++ b/lib/Target/R600/AMDIL7XXDevice.cpp
diff --git a/lib/Target/AMDGPU/AMDIL7XXDevice.h b/lib/Target/R600/AMDIL7XXDevice.h
index 1cf4ca415a..1cf4ca415a 100644
--- a/lib/Target/AMDGPU/AMDIL7XXDevice.h
+++ b/lib/Target/R600/AMDIL7XXDevice.h
diff --git a/lib/Target/AMDGPU/AMDILBase.td b/lib/Target/R600/AMDILBase.td
index c12cedcf7f..c12cedcf7f 100644
--- a/lib/Target/AMDGPU/AMDILBase.td
+++ b/lib/Target/R600/AMDILBase.td
diff --git a/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp b/lib/Target/R600/AMDILCFGStructurizer.cpp
index 568d281e63..568d281e63 100644
--- a/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp
+++ b/lib/Target/R600/AMDILCFGStructurizer.cpp
diff --git a/lib/Target/AMDGPU/AMDILDevice.cpp b/lib/Target/R600/AMDILDevice.cpp
index eec5059de2..eec5059de2 100644
--- a/lib/Target/AMDGPU/AMDILDevice.cpp
+++ b/lib/Target/R600/AMDILDevice.cpp
diff --git a/lib/Target/AMDGPU/AMDILDevice.h b/lib/Target/R600/AMDILDevice.h
index b9a15609df..b9a15609df 100644
--- a/lib/Target/AMDGPU/AMDILDevice.h
+++ b/lib/Target/R600/AMDILDevice.h
diff --git a/lib/Target/AMDGPU/AMDILDeviceInfo.cpp b/lib/Target/R600/AMDILDeviceInfo.cpp
index 9605fbe633..9605fbe633 100644
--- a/lib/Target/AMDGPU/AMDILDeviceInfo.cpp
+++ b/lib/Target/R600/AMDILDeviceInfo.cpp
diff --git a/lib/Target/AMDGPU/AMDILDeviceInfo.h b/lib/Target/R600/AMDILDeviceInfo.h
index 4b2c3a53c7..4b2c3a53c7 100644
--- a/lib/Target/AMDGPU/AMDILDeviceInfo.h
+++ b/lib/Target/R600/AMDILDeviceInfo.h
diff --git a/lib/Target/AMDGPU/AMDILDevices.h b/lib/Target/R600/AMDILDevices.h
index 636fa6d359..636fa6d359 100644
--- a/lib/Target/AMDGPU/AMDILDevices.h
+++ b/lib/Target/R600/AMDILDevices.h
diff --git a/lib/Target/AMDGPU/AMDILEvergreenDevice.cpp b/lib/Target/R600/AMDILEvergreenDevice.cpp
index c5213a0410..c5213a0410 100644
--- a/lib/Target/AMDGPU/AMDILEvergreenDevice.cpp
+++ b/lib/Target/R600/AMDILEvergreenDevice.cpp
diff --git a/lib/Target/AMDGPU/AMDILEvergreenDevice.h b/lib/Target/R600/AMDILEvergreenDevice.h
index 6dc2deb9ed..6dc2deb9ed 100644
--- a/lib/Target/AMDGPU/AMDILEvergreenDevice.h
+++ b/lib/Target/R600/AMDILEvergreenDevice.h
diff --git a/lib/Target/AMDGPU/AMDILFrameLowering.cpp b/lib/Target/R600/AMDILFrameLowering.cpp
index 9ad495ab48..9ad495ab48 100644
--- a/lib/Target/AMDGPU/AMDILFrameLowering.cpp
+++ b/lib/Target/R600/AMDILFrameLowering.cpp
diff --git a/lib/Target/AMDGPU/AMDILFrameLowering.h b/lib/Target/R600/AMDILFrameLowering.h
index 51337c3dd2..51337c3dd2 100644
--- a/lib/Target/AMDGPU/AMDILFrameLowering.h
+++ b/lib/Target/R600/AMDILFrameLowering.h
diff --git a/lib/Target/AMDGPU/AMDILISelDAGToDAG.cpp b/lib/Target/R600/AMDILISelDAGToDAG.cpp
index d15ed393c1..d15ed393c1 100644
--- a/lib/Target/AMDGPU/AMDILISelDAGToDAG.cpp
+++ b/lib/Target/R600/AMDILISelDAGToDAG.cpp
diff --git a/lib/Target/AMDGPU/AMDILISelLowering.cpp b/lib/Target/R600/AMDILISelLowering.cpp
index 8bfd30c6e3..8bfd30c6e3 100644
--- a/lib/Target/AMDGPU/AMDILISelLowering.cpp
+++ b/lib/Target/R600/AMDILISelLowering.cpp
diff --git a/lib/Target/AMDGPU/AMDILInstrInfo.td b/lib/Target/R600/AMDILInstrInfo.td
index e969bbf8ca..e969bbf8ca 100644
--- a/lib/Target/AMDGPU/AMDILInstrInfo.td
+++ b/lib/Target/R600/AMDILInstrInfo.td
diff --git a/lib/Target/AMDGPU/AMDILIntrinsicInfo.cpp b/lib/Target/R600/AMDILIntrinsicInfo.cpp
index 02d06d6f3d..02d06d6f3d 100644
--- a/lib/Target/AMDGPU/AMDILIntrinsicInfo.cpp
+++ b/lib/Target/R600/AMDILIntrinsicInfo.cpp
diff --git a/lib/Target/AMDGPU/AMDILIntrinsicInfo.h b/lib/Target/R600/AMDILIntrinsicInfo.h
index 83f4933611..83f4933611 100644
--- a/lib/Target/AMDGPU/AMDILIntrinsicInfo.h
+++ b/lib/Target/R600/AMDILIntrinsicInfo.h
diff --git a/lib/Target/AMDGPU/AMDILIntrinsics.td b/lib/Target/R600/AMDILIntrinsics.td
index 3f9e20f0c8..3f9e20f0c8 100644
--- a/lib/Target/AMDGPU/AMDILIntrinsics.td
+++ b/lib/Target/R600/AMDILIntrinsics.td
diff --git a/lib/Target/AMDGPU/AMDILNIDevice.cpp b/lib/Target/R600/AMDILNIDevice.cpp
index b82da5908a..b82da5908a 100644
--- a/lib/Target/AMDGPU/AMDILNIDevice.cpp
+++ b/lib/Target/R600/AMDILNIDevice.cpp
diff --git a/lib/Target/AMDGPU/AMDILNIDevice.h b/lib/Target/R600/AMDILNIDevice.h
index bc7df37b26..bc7df37b26 100644
--- a/lib/Target/AMDGPU/AMDILNIDevice.h
+++ b/lib/Target/R600/AMDILNIDevice.h
diff --git a/lib/Target/AMDGPU/AMDILPeepholeOptimizer.cpp b/lib/Target/R600/AMDILPeepholeOptimizer.cpp
index 57317ace63..57317ace63 100644
--- a/lib/Target/AMDGPU/AMDILPeepholeOptimizer.cpp
+++ b/lib/Target/R600/AMDILPeepholeOptimizer.cpp
diff --git a/lib/Target/AMDGPU/AMDILRegisterInfo.td b/lib/Target/R600/AMDILRegisterInfo.td
index b9d033432e..b9d033432e 100644
--- a/lib/Target/AMDGPU/AMDILRegisterInfo.td
+++ b/lib/Target/R600/AMDILRegisterInfo.td
diff --git a/lib/Target/AMDGPU/AMDILSIDevice.cpp b/lib/Target/R600/AMDILSIDevice.cpp
index 7c2710f1b2..7c2710f1b2 100644
--- a/lib/Target/AMDGPU/AMDILSIDevice.cpp
+++ b/lib/Target/R600/AMDILSIDevice.cpp
diff --git a/lib/Target/AMDGPU/AMDILSIDevice.h b/lib/Target/R600/AMDILSIDevice.h
index 5b2cb25022..5b2cb25022 100644
--- a/lib/Target/AMDGPU/AMDILSIDevice.h
+++ b/lib/Target/R600/AMDILSIDevice.h
diff --git a/lib/Target/AMDGPU/CMakeLists.txt b/lib/Target/R600/CMakeLists.txt
index b6b34176cf..cb13f81677 100644
--- a/lib/Target/AMDGPU/CMakeLists.txt
+++ b/lib/Target/R600/CMakeLists.txt
@@ -47,7 +47,7 @@ add_llvm_target(AMDGPUCodeGen
   SIFixSGPRLiveness.cpp
   )
 
-add_dependencies(LLVMAMDGPUCodeGen intrinsics_gen)
+add_dependencies(LLVMR600CodeGen intrinsics_gen)
 
 add_subdirectory(InstPrinter)
 add_subdirectory(TargetInfo)
diff --git a/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp b/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp
index e6c550b5ac..e6c550b5ac 100644
--- a/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp
+++ b/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp
diff --git a/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.h b/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h
index 96e0e46f8a..96e0e46f8a 100644
--- a/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.h
+++ b/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h
diff --git a/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt b/lib/Target/R600/InstPrinter/CMakeLists.txt
index 511c4095e4..67763374e1 100644
--- a/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt
+++ b/lib/Target/R600/InstPrinter/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 
-add_llvm_library(LLVMAMDGPUAsmPrinter
+add_llvm_library(LLVMR600AsmPrinter
   AMDGPUInstPrinter.cpp
   )
 
-add_dependencies(LLVMAMDGPUAsmPrinter AMDGPUCommonTableGen)
+add_dependencies(LLVMR600AsmPrinter R600CommonTableGen)
diff --git a/lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt b/lib/Target/R600/InstPrinter/LLVMBuild.txt
index 3dfca10c1b..ec0be89f10 100644
--- a/lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt
+++ b/lib/Target/R600/InstPrinter/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt --------------*- Conf -*--===;
+;===- ./lib/Target/R600/InstPrinter/LLVMBuild.txt -----------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,7 +17,8 @@
 
 [component_0]
 type = Library
-name = AMDGPUInfo
-parent = AMDGPU
+name = R600AsmPrinter
+parent = R600
 required_libraries = MC Support
-add_to_library_groups = AMDGPU
+add_to_library_groups = R600
+
diff --git a/lib/Target/AMDGPU/InstPrinter/Makefile b/lib/Target/R600/InstPrinter/Makefile
index 9ff8bbd338..a794cc1124 100644
--- a/lib/Target/AMDGPU/InstPrinter/Makefile
+++ b/lib/Target/R600/InstPrinter/Makefile
@@ -1,4 +1,4 @@
-#===- lib/Target/AMDGPU/AsmPrinter/Makefile ------------------*- Makefile -*-===##
+#===- lib/Target/R600/AsmPrinter/Makefile ------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -7,7 +7,7 @@
 #
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../../..
-LIBRARYNAME = LLVMAMDGPUAsmPrinter
+LIBRARYNAME = LLVMR600AsmPrinter
 
 # Hack: we need to include 'main' x86 target directory to grab private headers
 CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..
diff --git a/lib/Target/AMDGPU/LLVMBuild.txt b/lib/Target/R600/LLVMBuild.txt
index 84e44b4d52..f2a7554e52 100644
--- a/lib/Target/AMDGPU/LLVMBuild.txt
+++ b/lib/Target/R600/LLVMBuild.txt
@@ -20,13 +20,13 @@ subdirectories = InstPrinter MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
-name = AMDGPU
+name = R600
 parent = Target
 has_asmprinter = 1
 
 [component_1]
 type = Library
-name = AMDGPUCodeGen
-parent = AMDGPU
-required_libraries = AsmPrinter CodeGen Core SelectionDAG Support Target MC AMDGPUAsmPrinter AMDGPUDesc AMDGPUInfo 
-add_to_library_groups = AMDGPU
+name = R600CodeGen
+parent = R600
+required_libraries = AsmPrinter CodeGen Core SelectionDAG Support Target MC R600AsmPrinter R600Desc R600Info 
+add_to_library_groups = R600
diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp
index 8f41ebbdc5..8f41ebbdc5 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp
diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp
index 4d3d3e7945..4d3d3e7945 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp
diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h b/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.h
index 3ad0fa6824..3ad0fa6824 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.h
diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h b/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h
index 9d0d6cf6fd..9d0d6cf6fd 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h
diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
index 5006bfda6f..6a62856e10 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
@@ -91,7 +91,7 @@ static MCStreamer *createMCStreamer(const Target &T, StringRef TT,
   return createPureStreamer(Ctx, MAB, _OS, _Emitter);
 }
 
-extern "C" void LLVMInitializeAMDGPUTargetMC() {
+extern "C" void LLVMInitializeR600TargetMC() {
 
   RegisterMCAsmInfo<AMDGPUMCAsmInfo> Y(TheAMDGPUTarget);
 
diff --git a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
index 363a4af3f3..363a4af3f3 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
+++ b/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
diff --git a/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt b/lib/Target/R600/MCTargetDesc/CMakeLists.txt
index 9d921dfd23..37e714c2e7 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt
+++ b/lib/Target/R600/MCTargetDesc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_llvm_library(LLVMAMDGPUDesc
+add_llvm_library(LLVMR600Desc
   AMDGPUAsmBackend.cpp
   AMDGPUMCTargetDesc.cpp
   AMDGPUMCAsmInfo.cpp
@@ -7,4 +7,4 @@ add_llvm_library(LLVMAMDGPUDesc
   SIMCCodeEmitter.cpp
   )
 
-add_dependencies(LLVMAMDGPUDesc AMDGPUCommonTableGen)
+add_dependencies(LLVMR600Desc AMDGPUCommonTableGen)
diff --git a/lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt b/lib/Target/R600/MCTargetDesc/LLVMBuild.txt
index 8f46a9842f..b1beab0bb3 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt
+++ b/lib/Target/R600/MCTargetDesc/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt ------------*- Conf -*--===;
+;===- ./lib/Target/R600/MCTargetDesc/LLVMBuild.txt ------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,7 +17,7 @@
 
 [component_0]
 type = Library
-name = AMDGPUDesc
-parent = AMDGPU
-required_libraries = AMDGPUAsmPrinter AMDGPUInfo MC
-add_to_library_groups = AMDGPU
+name = R600Desc
+parent = R600
+required_libraries = R600AsmPrinter R600Info MC
+add_to_library_groups = R600
diff --git a/lib/Target/AMDGPU/MCTargetDesc/Makefile b/lib/Target/R600/MCTargetDesc/Makefile
index 5ad68662d9..8894a7607f 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/Makefile
+++ b/lib/Target/R600/MCTargetDesc/Makefile
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../../..
-LIBRARYNAME = LLVMAMDGPUDesc
+LIBRARYNAME = LLVMR600Desc
 
 # Hack: we need to include 'main' target directory to grab private headers
 CPP.Flags += -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..
diff --git a/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp b/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
index dc91924c73..dc91924c73 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp
+++ b/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
diff --git a/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp b/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp
index c47dc995c7..c47dc995c7 100644
--- a/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp
+++ b/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp
diff --git a/lib/Target/AMDGPU/Makefile b/lib/Target/R600/Makefile
index 7303f57a2a..1b3ebbe8c8 100644
--- a/lib/Target/AMDGPU/Makefile
+++ b/lib/Target/R600/Makefile
@@ -1,4 +1,4 @@
-##===- lib/Target/AMDGPU/Makefile ---------------------------*- Makefile -*-===##
+##===- lib/Target/R600/Makefile ---------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -8,7 +8,7 @@
 ##===----------------------------------------------------------------------===##
 
 LEVEL = ../../..
-LIBRARYNAME = LLVMAMDGPUCodeGen
+LIBRARYNAME = LLVMR600CodeGen
 TARGET = AMDGPU
 
 # Make sure that tblgen is run, first thing.
diff --git a/lib/Target/AMDGPU/Processors.td b/lib/Target/R600/Processors.td
index 3dc1ecda77..3dc1ecda77 100644
--- a/lib/Target/AMDGPU/Processors.td
+++ b/lib/Target/R600/Processors.td
diff --git a/lib/Target/AMDGPU/R600Defines.h b/lib/Target/R600/R600Defines.h
index 7dea8e44ea..7dea8e44ea 100644
--- a/lib/Target/AMDGPU/R600Defines.h
+++ b/lib/Target/R600/R600Defines.h
diff --git a/lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp b/lib/Target/R600/R600ExpandSpecialInstrs.cpp
index 58221f9ec2..58221f9ec2 100644
--- a/lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp
+++ b/lib/Target/R600/R600ExpandSpecialInstrs.cpp
diff --git a/lib/Target/AMDGPU/R600ISelLowering.cpp b/lib/Target/R600/R600ISelLowering.cpp
index d6b9d901e2..d6b9d901e2 100644
--- a/lib/Target/AMDGPU/R600ISelLowering.cpp
+++ b/lib/Target/R600/R600ISelLowering.cpp
diff --git a/lib/Target/AMDGPU/R600ISelLowering.h b/lib/Target/R600/R600ISelLowering.h
index 2b954dab55..2b954dab55 100644
--- a/lib/Target/AMDGPU/R600ISelLowering.h
+++ b/lib/Target/R600/R600ISelLowering.h
diff --git a/lib/Target/AMDGPU/R600InstrInfo.cpp b/lib/Target/R600/R600InstrInfo.cpp
index a60a1802d4..a60a1802d4 100644
--- a/lib/Target/AMDGPU/R600InstrInfo.cpp
+++ b/lib/Target/R600/R600InstrInfo.cpp
diff --git a/lib/Target/AMDGPU/R600InstrInfo.h b/lib/Target/R600/R600InstrInfo.h
index 6bb0ca92e4..6bb0ca92e4 100644
--- a/lib/Target/AMDGPU/R600InstrInfo.h
+++ b/lib/Target/R600/R600InstrInfo.h
diff --git a/lib/Target/AMDGPU/R600Instructions.td b/lib/Target/R600/R600Instructions.td
index 64bab18fa6..64bab18fa6 100644
--- a/lib/Target/AMDGPU/R600Instructions.td
+++ b/lib/Target/R600/R600Instructions.td
diff --git a/lib/Target/AMDGPU/R600Intrinsics.td b/lib/Target/R600/R600Intrinsics.td
index 3825bc4d3b..3825bc4d3b 100644
--- a/lib/Target/AMDGPU/R600Intrinsics.td
+++ b/lib/Target/R600/R600Intrinsics.td
diff --git a/lib/Target/AMDGPU/R600MachineFunctionInfo.cpp b/lib/Target/R600/R600MachineFunctionInfo.cpp
index 4eb5efa19f..4eb5efa19f 100644
--- a/lib/Target/AMDGPU/R600MachineFunctionInfo.cpp
+++ b/lib/Target/R600/R600MachineFunctionInfo.cpp
diff --git a/lib/Target/AMDGPU/R600MachineFunctionInfo.h b/lib/Target/R600/R600MachineFunctionInfo.h
index e97fb5be62..e97fb5be62 100644
--- a/lib/Target/AMDGPU/R600MachineFunctionInfo.h
+++ b/lib/Target/R600/R600MachineFunctionInfo.h
diff --git a/lib/Target/AMDGPU/R600RegisterInfo.cpp b/lib/Target/R600/R600RegisterInfo.cpp
index a39f83dbac..a39f83dbac 100644
--- a/lib/Target/AMDGPU/R600RegisterInfo.cpp
+++ b/lib/Target/R600/R600RegisterInfo.cpp
diff --git a/lib/Target/AMDGPU/R600RegisterInfo.h b/lib/Target/R600/R600RegisterInfo.h
index c170ccb378..c170ccb378 100644
--- a/lib/Target/AMDGPU/R600RegisterInfo.h
+++ b/lib/Target/R600/R600RegisterInfo.h
diff --git a/lib/Target/AMDGPU/R600RegisterInfo.td b/lib/Target/R600/R600RegisterInfo.td
index d3d6d25d29..d3d6d25d29 100644
--- a/lib/Target/AMDGPU/R600RegisterInfo.td
+++ b/lib/Target/R600/R600RegisterInfo.td
diff --git a/lib/Target/AMDGPU/R600Schedule.td b/lib/Target/R600/R600Schedule.td
index 7ede181c51..7ede181c51 100644
--- a/lib/Target/AMDGPU/R600Schedule.td
+++ b/lib/Target/R600/R600Schedule.td
diff --git a/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp b/lib/Target/R600/SIAnnotateControlFlow.cpp
index 92385b6878..92385b6878 100644
--- a/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp
+++ b/lib/Target/R600/SIAnnotateControlFlow.cpp
diff --git a/lib/Target/AMDGPU/SIAssignInterpRegs.cpp b/lib/Target/R600/SIAssignInterpRegs.cpp
index 832e44d766..832e44d766 100644
--- a/lib/Target/AMDGPU/SIAssignInterpRegs.cpp
+++ b/lib/Target/R600/SIAssignInterpRegs.cpp
diff --git a/lib/Target/AMDGPU/SIISelLowering.cpp b/lib/Target/R600/SIISelLowering.cpp
index cd6e0e9916..cd6e0e9916 100644
--- a/lib/Target/AMDGPU/SIISelLowering.cpp
+++ b/lib/Target/R600/SIISelLowering.cpp
diff --git a/lib/Target/AMDGPU/SIISelLowering.h b/lib/Target/R600/SIISelLowering.h
index c088112652..c088112652 100644
--- a/lib/Target/AMDGPU/SIISelLowering.h
+++ b/lib/Target/R600/SIISelLowering.h
diff --git a/lib/Target/AMDGPU/SIInstrFormats.td b/lib/Target/R600/SIInstrFormats.td
index aea3b5a888..aea3b5a888 100644
--- a/lib/Target/AMDGPU/SIInstrFormats.td
+++ b/lib/Target/R600/SIInstrFormats.td
diff --git a/lib/Target/AMDGPU/SIInstrInfo.cpp b/lib/Target/R600/SIInstrInfo.cpp
index 4aa4a45fb5..4aa4a45fb5 100644
--- a/lib/Target/AMDGPU/SIInstrInfo.cpp
+++ b/lib/Target/R600/SIInstrInfo.cpp
diff --git a/lib/Target/AMDGPU/SIInstrInfo.h b/lib/Target/R600/SIInstrInfo.h
index 631f6c00cc..631f6c00cc 100644
--- a/lib/Target/AMDGPU/SIInstrInfo.h
+++ b/lib/Target/R600/SIInstrInfo.h
diff --git a/lib/Target/AMDGPU/SIInstrInfo.td b/lib/Target/R600/SIInstrInfo.td
index 873a451e99..873a451e99 100644
--- a/lib/Target/AMDGPU/SIInstrInfo.td
+++ b/lib/Target/R600/SIInstrInfo.td
diff --git a/lib/Target/AMDGPU/SIInstructions.td b/lib/Target/R600/SIInstructions.td
index 005be96645..005be96645 100644
--- a/lib/Target/AMDGPU/SIInstructions.td
+++ b/lib/Target/R600/SIInstructions.td
diff --git a/lib/Target/AMDGPU/SIIntrinsics.td b/lib/Target/R600/SIIntrinsics.td
index c322fef0fe..c322fef0fe 100644
--- a/lib/Target/AMDGPU/SIIntrinsics.td
+++ b/lib/Target/R600/SIIntrinsics.td
diff --git a/lib/Target/AMDGPU/SILowerControlFlow.cpp b/lib/Target/R600/SILowerControlFlow.cpp
index 3fbe653a49..3fbe653a49 100644
--- a/lib/Target/AMDGPU/SILowerControlFlow.cpp
+++ b/lib/Target/R600/SILowerControlFlow.cpp
diff --git a/lib/Target/AMDGPU/SILowerLiteralConstants.cpp b/lib/Target/R600/SILowerLiteralConstants.cpp
index 2d5ab0bea1..2d5ab0bea1 100644
--- a/lib/Target/AMDGPU/SILowerLiteralConstants.cpp
+++ b/lib/Target/R600/SILowerLiteralConstants.cpp
diff --git a/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp b/lib/Target/R600/SIMachineFunctionInfo.cpp
index 7e59b42749..7e59b42749 100644
--- a/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
+++ b/lib/Target/R600/SIMachineFunctionInfo.cpp
diff --git a/lib/Target/AMDGPU/SIMachineFunctionInfo.h b/lib/Target/R600/SIMachineFunctionInfo.h
index 47271f5a1e..47271f5a1e 100644
--- a/lib/Target/AMDGPU/SIMachineFunctionInfo.h
+++ b/lib/Target/R600/SIMachineFunctionInfo.h
diff --git a/lib/Target/AMDGPU/SIRegisterInfo.cpp b/lib/Target/R600/SIRegisterInfo.cpp
index 88275c523f..88275c523f 100644
--- a/lib/Target/AMDGPU/SIRegisterInfo.cpp
+++ b/lib/Target/R600/SIRegisterInfo.cpp
diff --git a/lib/Target/AMDGPU/SIRegisterInfo.h b/lib/Target/R600/SIRegisterInfo.h
index 40171e4450..40171e4450 100644
--- a/lib/Target/AMDGPU/SIRegisterInfo.h
+++ b/lib/Target/R600/SIRegisterInfo.h
diff --git a/lib/Target/AMDGPU/SIRegisterInfo.td b/lib/Target/R600/SIRegisterInfo.td
index c3f136191a..c3f136191a 100644
--- a/lib/Target/AMDGPU/SIRegisterInfo.td
+++ b/lib/Target/R600/SIRegisterInfo.td
diff --git a/lib/Target/AMDGPU/SISchedule.td b/lib/Target/R600/SISchedule.td
index 28b65b8258..28b65b8258 100644
--- a/lib/Target/AMDGPU/SISchedule.td
+++ b/lib/Target/R600/SISchedule.td
diff --git a/lib/Target/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp b/lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp
index 0508afc468..46b1f18c62 100644
--- a/lib/Target/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp
+++ b/lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp
@@ -20,7 +20,7 @@ using namespace llvm;
 Target llvm::TheAMDGPUTarget;
 
 /// \brief Extern function to initialize the targets for the AMDGPU backend
-extern "C" void LLVMInitializeAMDGPUTargetInfo() {
+extern "C" void LLVMInitializeR600TargetInfo() {
   RegisterTarget<Triple::r600, false>
     R600(TheAMDGPUTarget, "r600", "AMD GPUs HD2XXX-HD6XXX");
 }
diff --git a/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt b/lib/Target/R600/TargetInfo/CMakeLists.txt
index 17ad1235d2..3d1584eba3 100644
--- a/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt
+++ b/lib/Target/R600/TargetInfo/CMakeLists.txt
@@ -1,7 +1,7 @@
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/.. )
 
-add_llvm_library(LLVMAMDGPUInfo
+add_llvm_library(LLVMR600Info
   AMDGPUTargetInfo.cpp
   )
 
-add_dependencies(LLVMAMDGPUInfo AMDGPUCommonTableGen intrinsics_gen)
+add_dependencies(LLVMR600Info AMDGPUCommonTableGen intrinsics_gen)
diff --git a/lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt b/lib/Target/R600/TargetInfo/LLVMBuild.txt
index fdb43844dc..4c6fea4aa0 100644
--- a/lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt
+++ b/lib/Target/R600/TargetInfo/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt -----------*- Conf -*--===;
+;===- ./lib/Target/R600/TargetInfo/LLVMBuild.txt --------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,8 +17,7 @@
 
 [component_0]
 type = Library
-name = AMDGPUAsmPrinter
-parent = AMDGPU
+name = R600Info
+parent = R600
 required_libraries = MC Support
-add_to_library_groups = AMDGPU
-
+add_to_library_groups = R600
diff --git a/lib/Target/AMDGPU/TargetInfo/Makefile b/lib/Target/R600/TargetInfo/Makefile
index 1b232871bd..b8ac4e7823 100644
--- a/lib/Target/AMDGPU/TargetInfo/Makefile
+++ b/lib/Target/R600/TargetInfo/Makefile
@@ -7,7 +7,7 @@
 #
 ##===----------------------------------------------------------------------===##
 LEVEL = ../../../..
-LIBRARYNAME = LLVMAMDGPUInfo
+LIBRARYNAME = LLVMR600Info
 
 # Hack: we need to include 'main' target directory to grab private headers
 CPPFLAGS = -I$(PROJ_OBJ_DIR)/.. -I$(PROJ_SRC_DIR)/..
diff --git a/test/CodeGen/R600/lit.local.cfg b/test/CodeGen/R600/lit.local.cfg
index 79fc2ba362..36ee493e59 100644
--- a/test/CodeGen/R600/lit.local.cfg
+++ b/test/CodeGen/R600/lit.local.cfg
@@ -8,6 +8,6 @@ def getRoot(config):
 root = getRoot(config)
 
 targets = set(root.targets_to_build.split())
-if not 'AMDGPU' in targets:
+if not 'R600' in targets:
     config.unsupported = True