R600 -> AMDGPU rename

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239657 91177308-0d34-0410-b5e6-96231b3b80d8
yuyichao · Jun 13, 2015 · 953c681 · 953c681
1 parent 8b8b72e
commit 953c681
Show file tree

Hide file tree

Showing 552 changed files with 62 additions and 60 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -176,6 +176,7 @@ set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include)
 
 set(LLVM_ALL_TARGETS
   AArch64
+  AMDGPU
   ARM
   BPF
   CppBackend
@@ -184,7 +185,6 @@ set(LLVM_ALL_TARGETS
   MSP430
   NVPTX
   PowerPC
-  R600
   Sparc
   SystemZ
   X86

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
@@ -1097,7 +1097,7 @@ if test "$llvm_cv_enable_crash_overrides" = "yes" ; then
 fi
 
 dnl List all possible targets
-ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ R600 BPF"
+ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ AMDGPU BPF"
 AC_SUBST(ALL_TARGETS,$ALL_TARGETS)
 
 dnl Allow specific targets to be specified for building (or not)
@@ -1132,7 +1132,8 @@ case "$enableval" in
         hexagon)  TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;;
         nvptx)    TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;;
         systemz)  TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;;
-        r600)     TARGETS_TO_BUILD="R600 $TARGETS_TO_BUILD" ;;
+        amdgpu)  ;&
+        r600)     TARGETS_TO_BUILD="AMDGPU $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
@@ -5628,7 +5628,7 @@ _ACEOF
 
 fi
 
-ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ R600 BPF"
+ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ AMDGPU BPF"
 ALL_TARGETS=$ALL_TARGETS
 
 
@@ -5665,7 +5665,8 @@ case "$enableval" in
         hexagon)  TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;;
         nvptx)    TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;;
         systemz)  TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;;
-        r600)     TARGETS_TO_BUILD="R600 $TARGETS_TO_BUILD" ;;
+        amdgpu)  ;&
+        r600)     TARGETS_TO_BUILD="AMDGPU $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/docs/R600Usage.rst → docs/AMDGPUUsage.rst b/docs/R600Usage.rst → docs/AMDGPUUsage.rst
@@ -1,11 +1,11 @@
-============================
-User Guide for R600 Back-end
-============================
+==============================
+User Guide for AMDGPU Back-end
+==============================
 
 Introduction
 ============
 
-The R600 back-end provides ISA code generation for AMD GPUs, starting with
+The AMDGPU back-end provides ISA code generation for AMD GPUs, starting with
 the R600 family up until the current Volcanic Islands (GCN Gen 3).
 
 
@@ -14,7 +14,7 @@ Assembler
 
 The assembler is currently considered experimental.
 
-For syntax examples look in test/MC/R600.
+For syntax examples look in test/MC/AMDGPU.
 
 Below some of the currently supported features (modulo bugs).  These
 all apply to the Southern Islands ISA, Sea Islands and Volcanic Islands

diff --git a/docs/CompilerWriterInfo.rst b/docs/CompilerWriterInfo.rst
@@ -68,8 +68,8 @@ Other documents, collections, notes
 * `PowerPC64 alignment of long doubles (from GCC) <http://gcc.gnu.org/ml/gcc-patches/2003-09/msg00997.html>`_
 * `Long branch stubs for powerpc64-linux (from binutils) <http://sources.redhat.com/ml/binutils/2002-04/msg00573.html>`_
 
-R600
-----
+AMDGPU
+------
 
 * `AMD R6xx shader ISA <http://developer.amd.com/wordpress/media/2012/10/R600_Instruction_Set_Architecture.pdf>`_
 * `AMD R7xx shader ISA <http://developer.amd.com/wordpress/media/2012/10/R700-Family_Instruction_Set_Architecture.pdf>`_

diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst
@@ -711,7 +711,7 @@ used by people developing LLVM.
 |                         | as ``LLVM_ALL_TARGETS``, and can be set to include |
 |                         | out-of-tree targets. The default value includes:   |
 |                         | ``AArch64, ARM, CppBackend, Hexagon,               |
-|                         | Mips, MSP430, NVPTX, PowerPC, R600, Sparc,         |
+|                         | Mips, MSP430, NVPTX, PowerPC, AMDGPU, Sparc,       |
 |                         | SystemZ, X86, XCore``.                             |
 +-------------------------+----------------------------------------------------+
 | LLVM_ENABLE_DOXYGEN     | Build doxygen-based documentation from the source  |

diff --git a/docs/index.rst b/docs/index.rst
@@ -252,7 +252,7 @@ For API clients and LLVM developers.
    WritingAnLLVMPass
    HowToUseAttributes
    NVPTXUsage
-   R600Usage
+   AMDGPUUsage
    StackMaps
    InAlloca
    BigEndianNEON
@@ -338,8 +338,8 @@ For API clients and LLVM developers.
 :doc:`NVPTXUsage`
    This document describes using the NVPTX back-end to compile GPU kernels.
 
-:doc:`R600Usage`
-   This document describes how to use the R600 back-end.
+:doc:`AMDGPUUsage`
+   This document describes how to use the AMDGPU back-end.
 
 :doc:`StackMaps`
   LLVM support for mapping instruction addresses to the location of

diff --git a/lib/Target/R600/AMDGPU.h → lib/Target/AMDGPU/AMDGPU.h b/lib/Target/R600/AMDGPU.h → lib/Target/AMDGPU/AMDGPU.h
diff --git a/lib/Target/R600/AMDGPU.td → lib/Target/AMDGPU/AMDGPU.td b/lib/Target/R600/AMDGPU.td → lib/Target/AMDGPU/AMDGPU.td
diff --git a/lib/Target/R600/AMDGPUAlwaysInlinePass.cpp → lib/Target/AMDGPU/AMDGPUAlwaysInlinePass.cpp b/lib/Target/R600/AMDGPUAlwaysInlinePass.cpp → lib/Target/AMDGPU/AMDGPUAlwaysInlinePass.cpp
diff --git a/lib/Target/R600/AMDGPUAsmPrinter.cpp → lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp b/lib/Target/R600/AMDGPUAsmPrinter.cpp → lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
@@ -80,7 +80,7 @@ createAMDGPUAsmPrinterPass(TargetMachine &tm,
   return new AMDGPUAsmPrinter(tm, std::move(Streamer));
 }
 
-extern "C" void LLVMInitializeR600AsmPrinter() {
+extern "C" void LLVMInitializeAMDGPUAsmPrinter() {
   TargetRegistry::RegisterAsmPrinter(TheAMDGPUTarget, createAMDGPUAsmPrinterPass);
   TargetRegistry::RegisterAsmPrinter(TheGCNTarget, createAMDGPUAsmPrinterPass);
 }

diff --git a/lib/Target/R600/AMDGPUAsmPrinter.h → lib/Target/AMDGPU/AMDGPUAsmPrinter.h b/lib/Target/R600/AMDGPUAsmPrinter.h → lib/Target/AMDGPU/AMDGPUAsmPrinter.h
diff --git a/lib/Target/R600/AMDGPUCallingConv.td → lib/Target/AMDGPU/AMDGPUCallingConv.td b/lib/Target/R600/AMDGPUCallingConv.td → lib/Target/AMDGPU/AMDGPUCallingConv.td
diff --git a/lib/Target/R600/AMDGPUFrameLowering.cpp → lib/Target/AMDGPU/AMDGPUFrameLowering.cpp b/lib/Target/R600/AMDGPUFrameLowering.cpp → lib/Target/AMDGPU/AMDGPUFrameLowering.cpp
diff --git a/lib/Target/R600/AMDGPUFrameLowering.h → lib/Target/AMDGPU/AMDGPUFrameLowering.h b/lib/Target/R600/AMDGPUFrameLowering.h → lib/Target/AMDGPU/AMDGPUFrameLowering.h
diff --git a/lib/Target/R600/AMDGPUISelDAGToDAG.cpp → lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp b/lib/Target/R600/AMDGPUISelDAGToDAG.cpp → lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp
diff --git a/lib/Target/R600/AMDGPUISelLowering.cpp → lib/Target/AMDGPU/AMDGPUISelLowering.cpp b/lib/Target/R600/AMDGPUISelLowering.cpp → lib/Target/AMDGPU/AMDGPUISelLowering.cpp
diff --git a/lib/Target/R600/AMDGPUISelLowering.h → lib/Target/AMDGPU/AMDGPUISelLowering.h b/lib/Target/R600/AMDGPUISelLowering.h → lib/Target/AMDGPU/AMDGPUISelLowering.h
diff --git a/lib/Target/R600/AMDGPUInstrInfo.cpp → lib/Target/AMDGPU/AMDGPUInstrInfo.cpp b/lib/Target/R600/AMDGPUInstrInfo.cpp → lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
diff --git a/lib/Target/R600/AMDGPUInstrInfo.h → lib/Target/AMDGPU/AMDGPUInstrInfo.h b/lib/Target/R600/AMDGPUInstrInfo.h → lib/Target/AMDGPU/AMDGPUInstrInfo.h
diff --git a/lib/Target/R600/AMDGPUInstrInfo.td → lib/Target/AMDGPU/AMDGPUInstrInfo.td b/lib/Target/R600/AMDGPUInstrInfo.td → lib/Target/AMDGPU/AMDGPUInstrInfo.td
diff --git a/lib/Target/R600/AMDGPUInstructions.td → lib/Target/AMDGPU/AMDGPUInstructions.td b/lib/Target/R600/AMDGPUInstructions.td → lib/Target/AMDGPU/AMDGPUInstructions.td
diff --git a/lib/Target/R600/AMDGPUIntrinsicInfo.cpp → lib/Target/AMDGPU/AMDGPUIntrinsicInfo.cpp b/lib/Target/R600/AMDGPUIntrinsicInfo.cpp → lib/Target/AMDGPU/AMDGPUIntrinsicInfo.cpp
diff --git a/lib/Target/R600/AMDGPUIntrinsicInfo.h → lib/Target/AMDGPU/AMDGPUIntrinsicInfo.h b/lib/Target/R600/AMDGPUIntrinsicInfo.h → lib/Target/AMDGPU/AMDGPUIntrinsicInfo.h
diff --git a/lib/Target/R600/AMDGPUIntrinsics.td → lib/Target/AMDGPU/AMDGPUIntrinsics.td b/lib/Target/R600/AMDGPUIntrinsics.td → lib/Target/AMDGPU/AMDGPUIntrinsics.td
diff --git a/lib/Target/R600/AMDGPUMCInstLower.cpp → lib/Target/AMDGPU/AMDGPUMCInstLower.cpp b/lib/Target/R600/AMDGPUMCInstLower.cpp → lib/Target/AMDGPU/AMDGPUMCInstLower.cpp
diff --git a/lib/Target/R600/AMDGPUMCInstLower.h → lib/Target/AMDGPU/AMDGPUMCInstLower.h b/lib/Target/R600/AMDGPUMCInstLower.h → lib/Target/AMDGPU/AMDGPUMCInstLower.h
diff --git a/lib/Target/R600/AMDGPUMachineFunction.cpp → lib/Target/AMDGPU/AMDGPUMachineFunction.cpp b/lib/Target/R600/AMDGPUMachineFunction.cpp → lib/Target/AMDGPU/AMDGPUMachineFunction.cpp
diff --git a/lib/Target/R600/AMDGPUMachineFunction.h → lib/Target/AMDGPU/AMDGPUMachineFunction.h b/lib/Target/R600/AMDGPUMachineFunction.h → lib/Target/AMDGPU/AMDGPUMachineFunction.h
diff --git a/lib/Target/R600/AMDGPUPromoteAlloca.cpp → lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp b/lib/Target/R600/AMDGPUPromoteAlloca.cpp → lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
diff --git a/lib/Target/R600/AMDGPURegisterInfo.cpp → lib/Target/AMDGPU/AMDGPURegisterInfo.cpp b/lib/Target/R600/AMDGPURegisterInfo.cpp → lib/Target/AMDGPU/AMDGPURegisterInfo.cpp
diff --git a/lib/Target/R600/AMDGPURegisterInfo.h → lib/Target/AMDGPU/AMDGPURegisterInfo.h b/lib/Target/R600/AMDGPURegisterInfo.h → lib/Target/AMDGPU/AMDGPURegisterInfo.h
diff --git a/lib/Target/R600/AMDGPURegisterInfo.td → lib/Target/AMDGPU/AMDGPURegisterInfo.td b/lib/Target/R600/AMDGPURegisterInfo.td → lib/Target/AMDGPU/AMDGPURegisterInfo.td
diff --git a/lib/Target/R600/AMDGPUSubtarget.cpp → lib/Target/AMDGPU/AMDGPUSubtarget.cpp b/lib/Target/R600/AMDGPUSubtarget.cpp → lib/Target/AMDGPU/AMDGPUSubtarget.cpp
diff --git a/lib/Target/R600/AMDGPUSubtarget.h → lib/Target/AMDGPU/AMDGPUSubtarget.h b/lib/Target/R600/AMDGPUSubtarget.h → lib/Target/AMDGPU/AMDGPUSubtarget.h
diff --git a/lib/Target/R600/AMDGPUTargetMachine.cpp → lib/Target/AMDGPU/AMDGPUTargetMachine.cpp b/lib/Target/R600/AMDGPUTargetMachine.cpp → lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
@@ -37,7 +37,7 @@
 
 using namespace llvm;
 
-extern "C" void LLVMInitializeR600Target() {
+extern "C" void LLVMInitializeAMDGPUTarget() {
   // Register the target
   RegisterTargetMachine<R600TargetMachine> X(TheAMDGPUTarget);
   RegisterTargetMachine<GCNTargetMachine> Y(TheGCNTarget);

diff --git a/lib/Target/R600/AMDGPUTargetMachine.h → lib/Target/AMDGPU/AMDGPUTargetMachine.h b/lib/Target/R600/AMDGPUTargetMachine.h → lib/Target/AMDGPU/AMDGPUTargetMachine.h
diff --git a/...Target/R600/AMDGPUTargetTransformInfo.cpp → ...rget/AMDGPU/AMDGPUTargetTransformInfo.cpp b/...Target/R600/AMDGPUTargetTransformInfo.cpp → ...rget/AMDGPU/AMDGPUTargetTransformInfo.cpp
diff --git a/lib/Target/R600/AMDGPUTargetTransformInfo.h → ...Target/AMDGPU/AMDGPUTargetTransformInfo.h b/lib/Target/R600/AMDGPUTargetTransformInfo.h → ...Target/AMDGPU/AMDGPUTargetTransformInfo.h
diff --git a/lib/Target/R600/AMDILCFGStructurizer.cpp → lib/Target/AMDGPU/AMDILCFGStructurizer.cpp b/lib/Target/R600/AMDILCFGStructurizer.cpp → lib/Target/AMDGPU/AMDILCFGStructurizer.cpp
diff --git a/lib/Target/R600/AMDKernelCodeT.h → lib/Target/AMDGPU/AMDKernelCodeT.h b/lib/Target/R600/AMDKernelCodeT.h → lib/Target/AMDGPU/AMDKernelCodeT.h
diff --git a/...Target/R600/AsmParser/AMDGPUAsmParser.cpp → ...rget/AMDGPU/AsmParser/AMDGPUAsmParser.cpp b/...Target/R600/AsmParser/AMDGPUAsmParser.cpp → ...rget/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
@@ -1369,7 +1369,7 @@ void AMDGPUAsmParser::cvtVOP3(MCInst &Inst, const OperandVector &Operands) {
 }
 
 /// Force static initialization.
-extern "C" void LLVMInitializeR600AsmParser() {
+extern "C" void LLVMInitializeAMDGPUAsmParser() {
   RegisterMCAsmParser<AMDGPUAsmParser> A(TheAMDGPUTarget);
   RegisterMCAsmParser<AMDGPUAsmParser> B(TheGCNTarget);
 }

diff --git a/lib/Target/AMDGPU/AsmParser/CMakeLists.txt b/lib/Target/AMDGPU/AsmParser/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_llvm_library(LLVMAMDGPUAsmParser
+  AMDGPUAsmParser.cpp
+  )
diff --git a/lib/Target/R600/MCTargetDesc/LLVMBuild.txt → lib/Target/AMDGPU/AsmParser/LLVMBuild.txt b/lib/Target/R600/MCTargetDesc/LLVMBuild.txt → lib/Target/AMDGPU/AsmParser/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/R600/MCTargetDesc/LLVMBuild.txt -------------*- Conf -*--===;
+;===- ./lib/Target/AMDGPU/AsmParser/LLVMBuild.txt -------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,7 +17,7 @@
 
 [component_0]
 type = Library
-name = R600Desc
-parent = R600
-required_libraries = MC R600AsmPrinter R600Info Support
-add_to_library_groups = R600
+name = AMDGPUAsmParser
+parent = AMDGPU
+required_libraries = MC MCParser AMDGPUDesc AMDGPUInfo Support
+add_to_library_groups = AMDGPU
diff --git a/lib/Target/R600/AsmParser/Makefile → lib/Target/AMDGPU/AsmParser/Makefile b/lib/Target/R600/AsmParser/Makefile → lib/Target/AMDGPU/AsmParser/Makefile
diff --git a/lib/Target/R600/CIInstructions.td → lib/Target/AMDGPU/CIInstructions.td b/lib/Target/R600/CIInstructions.td → lib/Target/AMDGPU/CIInstructions.td
diff --git a/lib/Target/R600/CMakeLists.txt → lib/Target/AMDGPU/CMakeLists.txt b/lib/Target/R600/CMakeLists.txt → lib/Target/AMDGPU/CMakeLists.txt
@@ -12,7 +12,7 @@ tablegen(LLVM AMDGPUGenAsmWriter.inc -gen-asm-writer)
 tablegen(LLVM AMDGPUGenAsmMatcher.inc -gen-asm-matcher)
 add_public_tablegen_target(AMDGPUCommonTableGen)
 
-add_llvm_target(R600CodeGen
+add_llvm_target(AMDGPUCodeGen
   AMDILCFGStructurizer.cpp
   AMDGPUAlwaysInlinePass.cpp
   AMDGPUAsmPrinter.cpp

diff --git a/lib/Target/R600/CaymanInstructions.td → lib/Target/AMDGPU/CaymanInstructions.td b/lib/Target/R600/CaymanInstructions.td → lib/Target/AMDGPU/CaymanInstructions.td
diff --git a/lib/Target/R600/EvergreenInstructions.td → lib/Target/AMDGPU/EvergreenInstructions.td b/lib/Target/R600/EvergreenInstructions.td → lib/Target/AMDGPU/EvergreenInstructions.td
diff --git a/...et/R600/InstPrinter/AMDGPUInstPrinter.cpp → .../AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp b/...et/R600/InstPrinter/AMDGPUInstPrinter.cpp → .../AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp
diff --git a/...rget/R600/InstPrinter/AMDGPUInstPrinter.h → ...et/AMDGPU/InstPrinter/AMDGPUInstPrinter.h b/...rget/R600/InstPrinter/AMDGPUInstPrinter.h → ...et/AMDGPU/InstPrinter/AMDGPUInstPrinter.h
diff --git a/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt b/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_llvm_library(LLVMAMDGPUAsmPrinter
+  AMDGPUInstPrinter.cpp
+  )
diff --git a/lib/Target/R600/InstPrinter/LLVMBuild.txt → lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt b/lib/Target/R600/InstPrinter/LLVMBuild.txt → lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/R600/InstPrinter/LLVMBuild.txt -----------*- Conf -*--===;
+;===- ./lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt -----------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,8 +17,8 @@
 
 [component_0]
 type = Library
-name = R600AsmPrinter
-parent = R600
+name = AMDGPUAsmPrinter
+parent = AMDGPU
 required_libraries = MC Support
-add_to_library_groups = R600
+add_to_library_groups = AMDGPU
 
diff --git a/lib/Target/R600/InstPrinter/Makefile → lib/Target/AMDGPU/InstPrinter/Makefile b/lib/Target/R600/InstPrinter/Makefile → lib/Target/AMDGPU/InstPrinter/Makefile
diff --git a/lib/Target/R600/LLVMBuild.txt → lib/Target/AMDGPU/LLVMBuild.txt b/lib/Target/R600/LLVMBuild.txt → lib/Target/AMDGPU/LLVMBuild.txt
@@ -20,14 +20,14 @@ subdirectories = AsmParser InstPrinter MCTargetDesc TargetInfo
 
 [component_0]
 type = TargetGroup
-name = R600
+name = AMDGPU
 parent = Target
 has_asmparser = 1
 has_asmprinter = 1
 
 [component_1]
 type = Library
-name = R600CodeGen
-parent = R600
-required_libraries = Analysis AsmPrinter CodeGen Core IPO MC R600AsmParser R600AsmPrinter R600Desc R600Info Scalar SelectionDAG Support Target TransformUtils
-add_to_library_groups = R600
+name = AMDGPUCodeGen
+parent = AMDGPU
+required_libraries = Analysis AsmPrinter CodeGen Core IPO MC AMDGPUAsmParser AMDGPUAsmPrinter AMDGPUDesc AMDGPUInfo Scalar SelectionDAG Support Target TransformUtils
+add_to_library_groups = AMDGPU
diff --git a/...et/R600/MCTargetDesc/AMDGPUAsmBackend.cpp → .../AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp b/...et/R600/MCTargetDesc/AMDGPUAsmBackend.cpp → .../AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
diff --git a/...00/MCTargetDesc/AMDGPUELFObjectWriter.cpp → ...PU/MCTargetDesc/AMDGPUELFObjectWriter.cpp b/...00/MCTargetDesc/AMDGPUELFObjectWriter.cpp → ...PU/MCTargetDesc/AMDGPUELFObjectWriter.cpp
diff --git a/...rget/R600/MCTargetDesc/AMDGPUFixupKinds.h → ...et/AMDGPU/MCTargetDesc/AMDGPUFixupKinds.h b/...rget/R600/MCTargetDesc/AMDGPUFixupKinds.h → ...et/AMDGPU/MCTargetDesc/AMDGPUFixupKinds.h
diff --git a/...get/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp → ...t/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp b/...get/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp → ...t/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp
diff --git a/...arget/R600/MCTargetDesc/AMDGPUMCAsmInfo.h → ...get/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h b/...arget/R600/MCTargetDesc/AMDGPUMCAsmInfo.h → ...get/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h
diff --git a/...R600/MCTargetDesc/AMDGPUMCCodeEmitter.cpp → ...DGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp b/...R600/MCTargetDesc/AMDGPUMCCodeEmitter.cpp → ...DGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp
diff --git a/...t/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h → ...AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h b/...t/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h → ...AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h
diff --git a/.../R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp → ...MDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/.../R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp → ...MDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp
@@ -72,7 +72,7 @@ static MCInstPrinter *createAMDGPUMCInstPrinter(const Triple &T,
   return new AMDGPUInstPrinter(MAI, MII, MRI);
 }
 
-extern "C" void LLVMInitializeR600TargetMC() {
+extern "C" void LLVMInitializeAMDGPUTargetMC() {
   for (Target *T : {&TheAMDGPUTarget, &TheGCNTarget}) {
     RegisterMCAsmInfo<AMDGPUMCAsmInfo> X(*T);
 

diff --git a/...et/R600/MCTargetDesc/AMDGPUMCTargetDesc.h → .../AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/...et/R600/MCTargetDesc/AMDGPUMCTargetDesc.h → .../AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
diff --git a/lib/Target/R600/MCTargetDesc/CMakeLists.txt → ...Target/AMDGPU/MCTargetDesc/CMakeLists.txt b/lib/Target/R600/MCTargetDesc/CMakeLists.txt → ...Target/AMDGPU/MCTargetDesc/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-add_llvm_library(LLVMR600Desc
+add_llvm_library(LLVMAMDGPUDesc
   AMDGPUAsmBackend.cpp
   AMDGPUELFObjectWriter.cpp
   AMDGPUMCCodeEmitter.cpp

diff --git a/lib/Target/R600/AsmParser/LLVMBuild.txt → lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt b/lib/Target/R600/AsmParser/LLVMBuild.txt → lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/R600/AsmParser/LLVMBuild.txt -------------*- Conf -*--===;
+;===- ./lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt -------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,7 +17,7 @@
 
 [component_0]
 type = Library
-name = R600AsmParser
-parent = R600
-required_libraries = MC MCParser R600Desc R600Info Support
-add_to_library_groups = R600
+name = AMDGPUDesc
+parent = AMDGPU
+required_libraries = MC AMDGPUAsmPrinter AMDGPUInfo Support
+add_to_library_groups = AMDGPU
diff --git a/lib/Target/R600/MCTargetDesc/Makefile → lib/Target/AMDGPU/MCTargetDesc/Makefile b/lib/Target/R600/MCTargetDesc/Makefile → lib/Target/AMDGPU/MCTargetDesc/Makefile
diff --git a/...t/R600/MCTargetDesc/R600MCCodeEmitter.cpp → ...AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp b/...t/R600/MCTargetDesc/R600MCCodeEmitter.cpp → ...AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp
diff --git a/...get/R600/MCTargetDesc/SIMCCodeEmitter.cpp → ...t/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp b/...get/R600/MCTargetDesc/SIMCCodeEmitter.cpp → ...t/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp
diff --git a/lib/Target/R600/Makefile → lib/Target/AMDGPU/Makefile b/lib/Target/R600/Makefile → lib/Target/AMDGPU/Makefile
diff --git a/lib/Target/R600/Processors.td → lib/Target/AMDGPU/Processors.td b/lib/Target/R600/Processors.td → lib/Target/AMDGPU/Processors.td
diff --git a/lib/Target/R600/R600ClauseMergePass.cpp → lib/Target/AMDGPU/R600ClauseMergePass.cpp b/lib/Target/R600/R600ClauseMergePass.cpp → lib/Target/AMDGPU/R600ClauseMergePass.cpp
diff --git a/lib/Target/R600/R600ControlFlowFinalizer.cpp → ...arget/AMDGPU/R600ControlFlowFinalizer.cpp b/lib/Target/R600/R600ControlFlowFinalizer.cpp → ...arget/AMDGPU/R600ControlFlowFinalizer.cpp
diff --git a/lib/Target/R600/R600Defines.h → lib/Target/AMDGPU/R600Defines.h b/lib/Target/R600/R600Defines.h → lib/Target/AMDGPU/R600Defines.h
diff --git a/lib/Target/R600/R600EmitClauseMarkers.cpp → lib/Target/AMDGPU/R600EmitClauseMarkers.cpp b/lib/Target/R600/R600EmitClauseMarkers.cpp → lib/Target/AMDGPU/R600EmitClauseMarkers.cpp
diff --git a/lib/Target/R600/R600ExpandSpecialInstrs.cpp → ...Target/AMDGPU/R600ExpandSpecialInstrs.cpp b/lib/Target/R600/R600ExpandSpecialInstrs.cpp → ...Target/AMDGPU/R600ExpandSpecialInstrs.cpp
diff --git a/lib/Target/R600/R600ISelLowering.cpp → lib/Target/AMDGPU/R600ISelLowering.cpp b/lib/Target/R600/R600ISelLowering.cpp → lib/Target/AMDGPU/R600ISelLowering.cpp
diff --git a/lib/Target/R600/R600ISelLowering.h → lib/Target/AMDGPU/R600ISelLowering.h b/lib/Target/R600/R600ISelLowering.h → lib/Target/AMDGPU/R600ISelLowering.h
diff --git a/lib/Target/R600/R600InstrFormats.td → lib/Target/AMDGPU/R600InstrFormats.td b/lib/Target/R600/R600InstrFormats.td → lib/Target/AMDGPU/R600InstrFormats.td
diff --git a/lib/Target/R600/R600InstrInfo.cpp → lib/Target/AMDGPU/R600InstrInfo.cpp b/lib/Target/R600/R600InstrInfo.cpp → lib/Target/AMDGPU/R600InstrInfo.cpp
diff --git a/lib/Target/R600/R600InstrInfo.h → lib/Target/AMDGPU/R600InstrInfo.h b/lib/Target/R600/R600InstrInfo.h → lib/Target/AMDGPU/R600InstrInfo.h
diff --git a/lib/Target/R600/R600Instructions.td → lib/Target/AMDGPU/R600Instructions.td b/lib/Target/R600/R600Instructions.td → lib/Target/AMDGPU/R600Instructions.td
diff --git a/lib/Target/R600/R600Intrinsics.td → lib/Target/AMDGPU/R600Intrinsics.td b/lib/Target/R600/R600Intrinsics.td → lib/Target/AMDGPU/R600Intrinsics.td
diff --git a/lib/Target/R600/R600MachineFunctionInfo.cpp → ...Target/AMDGPU/R600MachineFunctionInfo.cpp b/lib/Target/R600/R600MachineFunctionInfo.cpp → ...Target/AMDGPU/R600MachineFunctionInfo.cpp
diff --git a/lib/Target/R600/R600MachineFunctionInfo.h → lib/Target/AMDGPU/R600MachineFunctionInfo.h b/lib/Target/R600/R600MachineFunctionInfo.h → lib/Target/AMDGPU/R600MachineFunctionInfo.h
diff --git a/lib/Target/R600/R600MachineScheduler.cpp → lib/Target/AMDGPU/R600MachineScheduler.cpp b/lib/Target/R600/R600MachineScheduler.cpp → lib/Target/AMDGPU/R600MachineScheduler.cpp
diff --git a/lib/Target/R600/R600MachineScheduler.h → lib/Target/AMDGPU/R600MachineScheduler.h b/lib/Target/R600/R600MachineScheduler.h → lib/Target/AMDGPU/R600MachineScheduler.h
diff --git a/...rget/R600/R600OptimizeVectorRegisters.cpp → ...et/AMDGPU/R600OptimizeVectorRegisters.cpp b/...rget/R600/R600OptimizeVectorRegisters.cpp → ...et/AMDGPU/R600OptimizeVectorRegisters.cpp
diff --git a/lib/Target/R600/R600Packetizer.cpp → lib/Target/AMDGPU/R600Packetizer.cpp b/lib/Target/R600/R600Packetizer.cpp → lib/Target/AMDGPU/R600Packetizer.cpp
diff --git a/lib/Target/R600/R600RegisterInfo.cpp → lib/Target/AMDGPU/R600RegisterInfo.cpp b/lib/Target/R600/R600RegisterInfo.cpp → lib/Target/AMDGPU/R600RegisterInfo.cpp
diff --git a/lib/Target/R600/R600RegisterInfo.h → lib/Target/AMDGPU/R600RegisterInfo.h b/lib/Target/R600/R600RegisterInfo.h → lib/Target/AMDGPU/R600RegisterInfo.h
diff --git a/lib/Target/R600/R600RegisterInfo.td → lib/Target/AMDGPU/R600RegisterInfo.td b/lib/Target/R600/R600RegisterInfo.td → lib/Target/AMDGPU/R600RegisterInfo.td
diff --git a/lib/Target/R600/R600Schedule.td → lib/Target/AMDGPU/R600Schedule.td b/lib/Target/R600/R600Schedule.td → lib/Target/AMDGPU/R600Schedule.td
diff --git a/...et/R600/R600TextureIntrinsicsReplacer.cpp → .../AMDGPU/R600TextureIntrinsicsReplacer.cpp b/...et/R600/R600TextureIntrinsicsReplacer.cpp → .../AMDGPU/R600TextureIntrinsicsReplacer.cpp
diff --git a/lib/Target/R600/R700Instructions.td → lib/Target/AMDGPU/R700Instructions.td b/lib/Target/R600/R700Instructions.td → lib/Target/AMDGPU/R700Instructions.td
diff --git a/lib/Target/R600/SIAnnotateControlFlow.cpp → lib/Target/AMDGPU/SIAnnotateControlFlow.cpp b/lib/Target/R600/SIAnnotateControlFlow.cpp → lib/Target/AMDGPU/SIAnnotateControlFlow.cpp
diff --git a/lib/Target/R600/SIDefines.h → lib/Target/AMDGPU/SIDefines.h b/lib/Target/R600/SIDefines.h → lib/Target/AMDGPU/SIDefines.h
diff --git a/...et/R600/SIFixControlFlowLiveIntervals.cpp → .../AMDGPU/SIFixControlFlowLiveIntervals.cpp b/...et/R600/SIFixControlFlowLiveIntervals.cpp → .../AMDGPU/SIFixControlFlowLiveIntervals.cpp
diff --git a/lib/Target/R600/SIFixSGPRCopies.cpp → lib/Target/AMDGPU/SIFixSGPRCopies.cpp b/lib/Target/R600/SIFixSGPRCopies.cpp → lib/Target/AMDGPU/SIFixSGPRCopies.cpp
diff --git a/lib/Target/R600/SIFixSGPRLiveRanges.cpp → lib/Target/AMDGPU/SIFixSGPRLiveRanges.cpp b/lib/Target/R600/SIFixSGPRLiveRanges.cpp → lib/Target/AMDGPU/SIFixSGPRLiveRanges.cpp
diff --git a/lib/Target/R600/SIFoldOperands.cpp → lib/Target/AMDGPU/SIFoldOperands.cpp b/lib/Target/R600/SIFoldOperands.cpp → lib/Target/AMDGPU/SIFoldOperands.cpp
diff --git a/lib/Target/R600/SIISelLowering.cpp → lib/Target/AMDGPU/SIISelLowering.cpp b/lib/Target/R600/SIISelLowering.cpp → lib/Target/AMDGPU/SIISelLowering.cpp
diff --git a/lib/Target/R600/SIISelLowering.h → lib/Target/AMDGPU/SIISelLowering.h b/lib/Target/R600/SIISelLowering.h → lib/Target/AMDGPU/SIISelLowering.h
diff --git a/lib/Target/R600/SIInsertWaits.cpp → lib/Target/AMDGPU/SIInsertWaits.cpp b/lib/Target/R600/SIInsertWaits.cpp → lib/Target/AMDGPU/SIInsertWaits.cpp
diff --git a/lib/Target/R600/SIInstrFormats.td → lib/Target/AMDGPU/SIInstrFormats.td b/lib/Target/R600/SIInstrFormats.td → lib/Target/AMDGPU/SIInstrFormats.td
diff --git a/lib/Target/R600/SIInstrInfo.cpp → lib/Target/AMDGPU/SIInstrInfo.cpp b/lib/Target/R600/SIInstrInfo.cpp → lib/Target/AMDGPU/SIInstrInfo.cpp
diff --git a/lib/Target/R600/SIInstrInfo.h → lib/Target/AMDGPU/SIInstrInfo.h b/lib/Target/R600/SIInstrInfo.h → lib/Target/AMDGPU/SIInstrInfo.h
diff --git a/lib/Target/R600/SIInstrInfo.td → lib/Target/AMDGPU/SIInstrInfo.td b/lib/Target/R600/SIInstrInfo.td → lib/Target/AMDGPU/SIInstrInfo.td
diff --git a/lib/Target/R600/SIInstructions.td → lib/Target/AMDGPU/SIInstructions.td b/lib/Target/R600/SIInstructions.td → lib/Target/AMDGPU/SIInstructions.td
diff --git a/lib/Target/R600/SIIntrinsics.td → lib/Target/AMDGPU/SIIntrinsics.td b/lib/Target/R600/SIIntrinsics.td → lib/Target/AMDGPU/SIIntrinsics.td
diff --git a/lib/Target/R600/SILoadStoreOptimizer.cpp → lib/Target/AMDGPU/SILoadStoreOptimizer.cpp b/lib/Target/R600/SILoadStoreOptimizer.cpp → lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
diff --git a/lib/Target/R600/SILowerControlFlow.cpp → lib/Target/AMDGPU/SILowerControlFlow.cpp b/lib/Target/R600/SILowerControlFlow.cpp → lib/Target/AMDGPU/SILowerControlFlow.cpp
diff --git a/lib/Target/R600/SILowerI1Copies.cpp → lib/Target/AMDGPU/SILowerI1Copies.cpp b/lib/Target/R600/SILowerI1Copies.cpp → lib/Target/AMDGPU/SILowerI1Copies.cpp
diff --git a/lib/Target/R600/SIMachineFunctionInfo.cpp → lib/Target/AMDGPU/SIMachineFunctionInfo.cpp b/lib/Target/R600/SIMachineFunctionInfo.cpp → lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
diff --git a/lib/Target/R600/SIMachineFunctionInfo.h → lib/Target/AMDGPU/SIMachineFunctionInfo.h b/lib/Target/R600/SIMachineFunctionInfo.h → lib/Target/AMDGPU/SIMachineFunctionInfo.h
diff --git a/lib/Target/R600/SIPrepareScratchRegs.cpp → lib/Target/AMDGPU/SIPrepareScratchRegs.cpp b/lib/Target/R600/SIPrepareScratchRegs.cpp → lib/Target/AMDGPU/SIPrepareScratchRegs.cpp
diff --git a/lib/Target/R600/SIRegisterInfo.cpp → lib/Target/AMDGPU/SIRegisterInfo.cpp b/lib/Target/R600/SIRegisterInfo.cpp → lib/Target/AMDGPU/SIRegisterInfo.cpp
diff --git a/lib/Target/R600/SIRegisterInfo.h → lib/Target/AMDGPU/SIRegisterInfo.h b/lib/Target/R600/SIRegisterInfo.h → lib/Target/AMDGPU/SIRegisterInfo.h
diff --git a/lib/Target/R600/SIRegisterInfo.td → lib/Target/AMDGPU/SIRegisterInfo.td b/lib/Target/R600/SIRegisterInfo.td → lib/Target/AMDGPU/SIRegisterInfo.td
diff --git a/lib/Target/R600/SISchedule.td → lib/Target/AMDGPU/SISchedule.td b/lib/Target/R600/SISchedule.td → lib/Target/AMDGPU/SISchedule.td
diff --git a/lib/Target/R600/SIShrinkInstructions.cpp → lib/Target/AMDGPU/SIShrinkInstructions.cpp b/lib/Target/R600/SIShrinkInstructions.cpp → lib/Target/AMDGPU/SIShrinkInstructions.cpp
diff --git a/lib/Target/R600/SITypeRewriter.cpp → lib/Target/AMDGPU/SITypeRewriter.cpp b/lib/Target/R600/SITypeRewriter.cpp → lib/Target/AMDGPU/SITypeRewriter.cpp
diff --git a/...rget/R600/TargetInfo/AMDGPUTargetInfo.cpp → ...et/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp b/...rget/R600/TargetInfo/AMDGPUTargetInfo.cpp → ...et/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp
@@ -23,7 +23,7 @@ Target llvm::TheAMDGPUTarget;
 Target llvm::TheGCNTarget;
 
 /// \brief Extern function to initialize the targets for the AMDGPU backend
-extern "C" void LLVMInitializeR600TargetInfo() {
+extern "C" void LLVMInitializeAMDGPUTargetInfo() {
   RegisterTarget<Triple::r600, false>
     R600(TheAMDGPUTarget, "r600", "AMD GPUs HD2XXX-HD6XXX");
   RegisterTarget<Triple::amdgcn, false> GCN(TheGCNTarget, "amdgcn", "AMD GCN GPUs");

diff --git a/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt b/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_llvm_library(LLVMAMDGPUInfo
+  AMDGPUTargetInfo.cpp
+  )
diff --git a/lib/Target/R600/TargetInfo/LLVMBuild.txt → lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt b/lib/Target/R600/TargetInfo/LLVMBuild.txt → lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/R600/TargetInfo/LLVMBuild.txt --------------*- Conf -*--===;
+;===- ./lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt --------------*- Conf -*--===;
 ;
 ;                     The LLVM Compiler Infrastructure
 ;
@@ -17,7 +17,7 @@
 
 [component_0]
 type = Library
-name = R600Info
-parent = R600
+name = AMDGPUInfo
+parent = AMDGPU
 required_libraries = Support
-add_to_library_groups = R600
+add_to_library_groups = AMDGPU
diff --git a/lib/Target/R600/TargetInfo/Makefile → lib/Target/AMDGPU/TargetInfo/Makefile b/lib/Target/R600/TargetInfo/Makefile → lib/Target/AMDGPU/TargetInfo/Makefile
diff --git a/lib/Target/R600/VIInstrFormats.td → lib/Target/AMDGPU/VIInstrFormats.td b/lib/Target/R600/VIInstrFormats.td → lib/Target/AMDGPU/VIInstrFormats.td
diff --git a/lib/Target/R600/VIInstructions.td → lib/Target/AMDGPU/VIInstructions.td b/lib/Target/R600/VIInstructions.td → lib/Target/AMDGPU/VIInstructions.td
diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt
@@ -19,6 +19,7 @@
 ; will typically require only insertion of a line.
 [common]
 subdirectories =
+ AMDGPU
  ARM
  AArch64
  BPF
@@ -28,7 +29,6 @@ subdirectories =
  NVPTX
  Mips
  PowerPC
- R600
  Sparc
  SystemZ
  X86

diff --git a/lib/Target/R600/AsmParser/CMakeLists.txt b/lib/Target/R600/AsmParser/CMakeLists.txt
diff --git a/lib/Target/R600/InstPrinter/CMakeLists.txt b/lib/Target/R600/InstPrinter/CMakeLists.txt
diff --git a/lib/Target/R600/TargetInfo/CMakeLists.txt b/lib/Target/R600/TargetInfo/CMakeLists.txt
diff --git a/...odeGen/R600/32-bit-local-address-space.ll → ...eGen/AMDGPU/32-bit-local-address-space.ll b/...odeGen/R600/32-bit-local-address-space.ll → ...eGen/AMDGPU/32-bit-local-address-space.ll
diff --git a/test/CodeGen/R600/README → test/CodeGen/AMDGPU/README b/test/CodeGen/R600/README → test/CodeGen/AMDGPU/README
diff --git a/test/CodeGen/R600/add-debug.ll → test/CodeGen/AMDGPU/add-debug.ll b/test/CodeGen/R600/add-debug.ll → test/CodeGen/AMDGPU/add-debug.ll
diff --git a/test/CodeGen/R600/add.ll → test/CodeGen/AMDGPU/add.ll b/test/CodeGen/R600/add.ll → test/CodeGen/AMDGPU/add.ll
diff --git a/test/CodeGen/R600/add_i64.ll → test/CodeGen/AMDGPU/add_i64.ll b/test/CodeGen/R600/add_i64.ll → test/CodeGen/AMDGPU/add_i64.ll
diff --git a/test/CodeGen/R600/address-space.ll → test/CodeGen/AMDGPU/address-space.ll b/test/CodeGen/R600/address-space.ll → test/CodeGen/AMDGPU/address-space.ll
diff --git a/test/CodeGen/R600/and.ll → test/CodeGen/AMDGPU/and.ll b/test/CodeGen/R600/and.ll → test/CodeGen/AMDGPU/and.ll
diff --git a/test/CodeGen/R600/anyext.ll → test/CodeGen/AMDGPU/anyext.ll b/test/CodeGen/R600/anyext.ll → test/CodeGen/AMDGPU/anyext.ll
diff --git a/test/CodeGen/R600/array-ptr-calc-i32.ll → test/CodeGen/AMDGPU/array-ptr-calc-i32.ll b/test/CodeGen/R600/array-ptr-calc-i32.ll → test/CodeGen/AMDGPU/array-ptr-calc-i32.ll
diff --git a/test/CodeGen/R600/array-ptr-calc-i64.ll → test/CodeGen/AMDGPU/array-ptr-calc-i64.ll b/test/CodeGen/R600/array-ptr-calc-i64.ll → test/CodeGen/AMDGPU/array-ptr-calc-i64.ll
diff --git a/test/CodeGen/R600/atomic_cmp_swap_local.ll → test/CodeGen/AMDGPU/atomic_cmp_swap_local.ll b/test/CodeGen/R600/atomic_cmp_swap_local.ll → test/CodeGen/AMDGPU/atomic_cmp_swap_local.ll
diff --git a/test/CodeGen/R600/atomic_load_add.ll → test/CodeGen/AMDGPU/atomic_load_add.ll b/test/CodeGen/R600/atomic_load_add.ll → test/CodeGen/AMDGPU/atomic_load_add.ll
diff --git a/test/CodeGen/R600/atomic_load_sub.ll → test/CodeGen/AMDGPU/atomic_load_sub.ll b/test/CodeGen/R600/atomic_load_sub.ll → test/CodeGen/AMDGPU/atomic_load_sub.ll
diff --git a/test/CodeGen/R600/basic-branch.ll → test/CodeGen/AMDGPU/basic-branch.ll b/test/CodeGen/R600/basic-branch.ll → test/CodeGen/AMDGPU/basic-branch.ll
diff --git a/test/CodeGen/R600/basic-loop.ll → test/CodeGen/AMDGPU/basic-loop.ll b/test/CodeGen/R600/basic-loop.ll → test/CodeGen/AMDGPU/basic-loop.ll
diff --git a/test/CodeGen/R600/bfe_uint.ll → test/CodeGen/AMDGPU/bfe_uint.ll b/test/CodeGen/R600/bfe_uint.ll → test/CodeGen/AMDGPU/bfe_uint.ll
diff --git a/test/CodeGen/R600/bfi_int.ll → test/CodeGen/AMDGPU/bfi_int.ll b/test/CodeGen/R600/bfi_int.ll → test/CodeGen/AMDGPU/bfi_int.ll
diff --git a/test/CodeGen/R600/big_alu.ll → test/CodeGen/AMDGPU/big_alu.ll b/test/CodeGen/R600/big_alu.ll → test/CodeGen/AMDGPU/big_alu.ll
diff --git a/test/CodeGen/R600/bitcast.ll → test/CodeGen/AMDGPU/bitcast.ll b/test/CodeGen/R600/bitcast.ll → test/CodeGen/AMDGPU/bitcast.ll
diff --git a/test/CodeGen/R600/bswap.ll → test/CodeGen/AMDGPU/bswap.ll b/test/CodeGen/R600/bswap.ll → test/CodeGen/AMDGPU/bswap.ll
diff --git a/test/CodeGen/R600/build_vector.ll → test/CodeGen/AMDGPU/build_vector.ll b/test/CodeGen/R600/build_vector.ll → test/CodeGen/AMDGPU/build_vector.ll
diff --git a/test/CodeGen/R600/call.ll → test/CodeGen/AMDGPU/call.ll b/test/CodeGen/R600/call.ll → test/CodeGen/AMDGPU/call.ll
diff --git a/test/CodeGen/R600/call_fs.ll → test/CodeGen/AMDGPU/call_fs.ll b/test/CodeGen/R600/call_fs.ll → test/CodeGen/AMDGPU/call_fs.ll
diff --git a/test/CodeGen/R600/cayman-loop-bug.ll → test/CodeGen/AMDGPU/cayman-loop-bug.ll b/test/CodeGen/R600/cayman-loop-bug.ll → test/CodeGen/AMDGPU/cayman-loop-bug.ll
diff --git a/test/CodeGen/R600/cf-stack-bug.ll → test/CodeGen/AMDGPU/cf-stack-bug.ll b/test/CodeGen/R600/cf-stack-bug.ll → test/CodeGen/AMDGPU/cf-stack-bug.ll
diff --git a/test/CodeGen/R600/cf_end.ll → test/CodeGen/AMDGPU/cf_end.ll b/test/CodeGen/R600/cf_end.ll → test/CodeGen/AMDGPU/cf_end.ll
diff --git a/test/CodeGen/R600/cgp-addressing-modes.ll → test/CodeGen/AMDGPU/cgp-addressing-modes.ll b/test/CodeGen/R600/cgp-addressing-modes.ll → test/CodeGen/AMDGPU/cgp-addressing-modes.ll
diff --git a/test/CodeGen/R600/coalescer_remat.ll → test/CodeGen/AMDGPU/coalescer_remat.ll b/test/CodeGen/R600/coalescer_remat.ll → test/CodeGen/AMDGPU/coalescer_remat.ll
diff --git a/...Gen/R600/codegen-prepare-addrmode-sext.ll → ...n/AMDGPU/codegen-prepare-addrmode-sext.ll b/...Gen/R600/codegen-prepare-addrmode-sext.ll → ...n/AMDGPU/codegen-prepare-addrmode-sext.ll
diff --git a/test/CodeGen/R600/combine_vloads.ll → test/CodeGen/AMDGPU/combine_vloads.ll b/test/CodeGen/R600/combine_vloads.ll → test/CodeGen/AMDGPU/combine_vloads.ll
diff --git a/test/CodeGen/R600/commute-compares.ll → test/CodeGen/AMDGPU/commute-compares.ll b/test/CodeGen/R600/commute-compares.ll → test/CodeGen/AMDGPU/commute-compares.ll
diff --git a/test/CodeGen/R600/commute_modifiers.ll → test/CodeGen/AMDGPU/commute_modifiers.ll b/test/CodeGen/R600/commute_modifiers.ll → test/CodeGen/AMDGPU/commute_modifiers.ll
diff --git a/test/CodeGen/R600/complex-folding.ll → test/CodeGen/AMDGPU/complex-folding.ll b/test/CodeGen/R600/complex-folding.ll → test/CodeGen/AMDGPU/complex-folding.ll
diff --git a/test/CodeGen/R600/concat_vectors.ll → test/CodeGen/AMDGPU/concat_vectors.ll b/test/CodeGen/R600/concat_vectors.ll → test/CodeGen/AMDGPU/concat_vectors.ll
diff --git a/test/CodeGen/R600/copy-illegal-type.ll → test/CodeGen/AMDGPU/copy-illegal-type.ll b/test/CodeGen/R600/copy-illegal-type.ll → test/CodeGen/AMDGPU/copy-illegal-type.ll
diff --git a/test/CodeGen/R600/copy-to-reg.ll → test/CodeGen/AMDGPU/copy-to-reg.ll b/test/CodeGen/R600/copy-to-reg.ll → test/CodeGen/AMDGPU/copy-to-reg.ll
diff --git a/test/CodeGen/R600/ctlz_zero_undef.ll → test/CodeGen/AMDGPU/ctlz_zero_undef.ll b/test/CodeGen/R600/ctlz_zero_undef.ll → test/CodeGen/AMDGPU/ctlz_zero_undef.ll
diff --git a/test/CodeGen/R600/ctpop.ll → test/CodeGen/AMDGPU/ctpop.ll b/test/CodeGen/R600/ctpop.ll → test/CodeGen/AMDGPU/ctpop.ll
diff --git a/test/CodeGen/R600/ctpop64.ll → test/CodeGen/AMDGPU/ctpop64.ll b/test/CodeGen/R600/ctpop64.ll → test/CodeGen/AMDGPU/ctpop64.ll
diff --git a/test/CodeGen/R600/cttz_zero_undef.ll → test/CodeGen/AMDGPU/cttz_zero_undef.ll b/test/CodeGen/R600/cttz_zero_undef.ll → test/CodeGen/AMDGPU/cttz_zero_undef.ll
diff --git a/test/CodeGen/R600/cvt_f32_ubyte.ll → test/CodeGen/AMDGPU/cvt_f32_ubyte.ll b/test/CodeGen/R600/cvt_f32_ubyte.ll → test/CodeGen/AMDGPU/cvt_f32_ubyte.ll
diff --git a/test/CodeGen/R600/cvt_flr_i32_f32.ll → test/CodeGen/AMDGPU/cvt_flr_i32_f32.ll b/test/CodeGen/R600/cvt_flr_i32_f32.ll → test/CodeGen/AMDGPU/cvt_flr_i32_f32.ll
diff --git a/test/CodeGen/R600/cvt_rpi_i32_f32.ll → test/CodeGen/AMDGPU/cvt_rpi_i32_f32.ll b/test/CodeGen/R600/cvt_rpi_i32_f32.ll → test/CodeGen/AMDGPU/cvt_rpi_i32_f32.ll
diff --git a/...dagcombiner-bug-illegal-vec4-int-to-fp.ll → ...dagcombiner-bug-illegal-vec4-int-to-fp.ll b/...dagcombiner-bug-illegal-vec4-int-to-fp.ll → ...dagcombiner-bug-illegal-vec4-int-to-fp.ll
diff --git a/test/CodeGen/R600/debug.ll → test/CodeGen/AMDGPU/debug.ll b/test/CodeGen/R600/debug.ll → test/CodeGen/AMDGPU/debug.ll
diff --git a/test/CodeGen/R600/default-fp-mode.ll → test/CodeGen/AMDGPU/default-fp-mode.ll b/test/CodeGen/R600/default-fp-mode.ll → test/CodeGen/AMDGPU/default-fp-mode.ll
diff --git a/...en/R600/disconnected-predset-break-bug.ll → .../AMDGPU/disconnected-predset-break-bug.ll b/...en/R600/disconnected-predset-break-bug.ll → .../AMDGPU/disconnected-predset-break-bug.ll
diff --git a/test/CodeGen/R600/dot4-folding.ll → test/CodeGen/AMDGPU/dot4-folding.ll b/test/CodeGen/R600/dot4-folding.ll → test/CodeGen/AMDGPU/dot4-folding.ll
diff --git a/...s-negative-offset-addressing-mode-loop.ll → ...s-negative-offset-addressing-mode-loop.ll b/...s-negative-offset-addressing-mode-loop.ll → ...s-negative-offset-addressing-mode-loop.ll
diff --git a/test/CodeGen/R600/ds_read2.ll → test/CodeGen/AMDGPU/ds_read2.ll b/test/CodeGen/R600/ds_read2.ll → test/CodeGen/AMDGPU/ds_read2.ll
diff --git a/test/CodeGen/R600/ds_read2_offset_order.ll → test/CodeGen/AMDGPU/ds_read2_offset_order.ll b/test/CodeGen/R600/ds_read2_offset_order.ll → test/CodeGen/AMDGPU/ds_read2_offset_order.ll
diff --git a/test/CodeGen/R600/ds_read2st64.ll → test/CodeGen/AMDGPU/ds_read2st64.ll b/test/CodeGen/R600/ds_read2st64.ll → test/CodeGen/AMDGPU/ds_read2st64.ll
diff --git a/test/CodeGen/R600/ds_write2.ll → test/CodeGen/AMDGPU/ds_write2.ll b/test/CodeGen/R600/ds_write2.ll → test/CodeGen/AMDGPU/ds_write2.ll
diff --git a/test/CodeGen/R600/ds_write2st64.ll → test/CodeGen/AMDGPU/ds_write2st64.ll b/test/CodeGen/R600/ds_write2st64.ll → test/CodeGen/AMDGPU/ds_write2st64.ll
diff --git a/test/CodeGen/R600/elf.ll → test/CodeGen/AMDGPU/elf.ll b/test/CodeGen/R600/elf.ll → test/CodeGen/AMDGPU/elf.ll
diff --git a/test/CodeGen/R600/elf.r600.ll → test/CodeGen/AMDGPU/elf.r600.ll b/test/CodeGen/R600/elf.r600.ll → test/CodeGen/AMDGPU/elf.r600.ll
diff --git a/test/CodeGen/R600/empty-function.ll → test/CodeGen/AMDGPU/empty-function.ll b/test/CodeGen/R600/empty-function.ll → test/CodeGen/AMDGPU/empty-function.ll
diff --git a/test/CodeGen/R600/endcf-loop-header.ll → test/CodeGen/AMDGPU/endcf-loop-header.ll b/test/CodeGen/R600/endcf-loop-header.ll → test/CodeGen/AMDGPU/endcf-loop-header.ll
diff --git a/test/CodeGen/R600/extload-private.ll → test/CodeGen/AMDGPU/extload-private.ll b/test/CodeGen/R600/extload-private.ll → test/CodeGen/AMDGPU/extload-private.ll
diff --git a/test/CodeGen/R600/extload.ll → test/CodeGen/AMDGPU/extload.ll b/test/CodeGen/R600/extload.ll → test/CodeGen/AMDGPU/extload.ll
diff --git a/test/CodeGen/R600/extract_vector_elt_i16.ll → .../CodeGen/AMDGPU/extract_vector_elt_i16.ll b/test/CodeGen/R600/extract_vector_elt_i16.ll → .../CodeGen/AMDGPU/extract_vector_elt_i16.ll
diff --git a/test/CodeGen/R600/fabs.f64.ll → test/CodeGen/AMDGPU/fabs.f64.ll b/test/CodeGen/R600/fabs.f64.ll → test/CodeGen/AMDGPU/fabs.f64.ll
diff --git a/test/CodeGen/R600/fabs.ll → test/CodeGen/AMDGPU/fabs.ll b/test/CodeGen/R600/fabs.ll → test/CodeGen/AMDGPU/fabs.ll
diff --git a/test/CodeGen/R600/fadd.ll → test/CodeGen/AMDGPU/fadd.ll b/test/CodeGen/R600/fadd.ll → test/CodeGen/AMDGPU/fadd.ll
diff --git a/test/CodeGen/R600/fadd64.ll → test/CodeGen/AMDGPU/fadd64.ll b/test/CodeGen/R600/fadd64.ll → test/CodeGen/AMDGPU/fadd64.ll
diff --git a/test/CodeGen/R600/fceil.ll → test/CodeGen/AMDGPU/fceil.ll b/test/CodeGen/R600/fceil.ll → test/CodeGen/AMDGPU/fceil.ll
diff --git a/test/CodeGen/R600/fceil64.ll → test/CodeGen/AMDGPU/fceil64.ll b/test/CodeGen/R600/fceil64.ll → test/CodeGen/AMDGPU/fceil64.ll
diff --git a/test/CodeGen/R600/fcmp-cnd.ll → test/CodeGen/AMDGPU/fcmp-cnd.ll b/test/CodeGen/R600/fcmp-cnd.ll → test/CodeGen/AMDGPU/fcmp-cnd.ll
diff --git a/test/CodeGen/R600/fcmp-cnde-int-args.ll → test/CodeGen/AMDGPU/fcmp-cnde-int-args.ll b/test/CodeGen/R600/fcmp-cnde-int-args.ll → test/CodeGen/AMDGPU/fcmp-cnde-int-args.ll
diff --git a/test/CodeGen/R600/fcmp.ll → test/CodeGen/AMDGPU/fcmp.ll b/test/CodeGen/R600/fcmp.ll → test/CodeGen/AMDGPU/fcmp.ll
diff --git a/test/CodeGen/R600/fcmp64.ll → test/CodeGen/AMDGPU/fcmp64.ll b/test/CodeGen/R600/fcmp64.ll → test/CodeGen/AMDGPU/fcmp64.ll
diff --git a/test/CodeGen/R600/fconst64.ll → test/CodeGen/AMDGPU/fconst64.ll b/test/CodeGen/R600/fconst64.ll → test/CodeGen/AMDGPU/fconst64.ll
diff --git a/test/CodeGen/R600/fcopysign.f32.ll → test/CodeGen/AMDGPU/fcopysign.f32.ll b/test/CodeGen/R600/fcopysign.f32.ll → test/CodeGen/AMDGPU/fcopysign.f32.ll
diff --git a/test/CodeGen/R600/fcopysign.f64.ll → test/CodeGen/AMDGPU/fcopysign.f64.ll b/test/CodeGen/R600/fcopysign.f64.ll → test/CodeGen/AMDGPU/fcopysign.f64.ll
diff --git a/test/CodeGen/R600/fdiv.f64.ll → test/CodeGen/AMDGPU/fdiv.f64.ll b/test/CodeGen/R600/fdiv.f64.ll → test/CodeGen/AMDGPU/fdiv.f64.ll
diff --git a/test/CodeGen/R600/fdiv.ll → test/CodeGen/AMDGPU/fdiv.ll b/test/CodeGen/R600/fdiv.ll → test/CodeGen/AMDGPU/fdiv.ll
diff --git a/test/CodeGen/R600/fetch-limits.r600.ll → test/CodeGen/AMDGPU/fetch-limits.r600.ll b/test/CodeGen/R600/fetch-limits.r600.ll → test/CodeGen/AMDGPU/fetch-limits.r600.ll
diff --git a/test/CodeGen/R600/fetch-limits.r700+.ll → test/CodeGen/AMDGPU/fetch-limits.r700+.ll b/test/CodeGen/R600/fetch-limits.r700+.ll → test/CodeGen/AMDGPU/fetch-limits.r700+.ll
diff --git a/test/CodeGen/R600/ffloor.f64.ll → test/CodeGen/AMDGPU/ffloor.f64.ll b/test/CodeGen/R600/ffloor.f64.ll → test/CodeGen/AMDGPU/ffloor.f64.ll
diff --git a/test/CodeGen/R600/ffloor.ll → test/CodeGen/AMDGPU/ffloor.ll b/test/CodeGen/R600/ffloor.ll → test/CodeGen/AMDGPU/ffloor.ll
diff --git a/test/CodeGen/R600/flat-address-space.ll → test/CodeGen/AMDGPU/flat-address-space.ll b/test/CodeGen/R600/flat-address-space.ll → test/CodeGen/AMDGPU/flat-address-space.ll
diff --git a/test/CodeGen/R600/floor.ll → test/CodeGen/AMDGPU/floor.ll b/test/CodeGen/R600/floor.ll → test/CodeGen/AMDGPU/floor.ll
diff --git a/test/CodeGen/R600/fma-combine.ll → test/CodeGen/AMDGPU/fma-combine.ll b/test/CodeGen/R600/fma-combine.ll → test/CodeGen/AMDGPU/fma-combine.ll
diff --git a/test/CodeGen/R600/fma.f64.ll → test/CodeGen/AMDGPU/fma.f64.ll b/test/CodeGen/R600/fma.f64.ll → test/CodeGen/AMDGPU/fma.f64.ll
diff --git a/test/CodeGen/R600/fma.ll → test/CodeGen/AMDGPU/fma.ll b/test/CodeGen/R600/fma.ll → test/CodeGen/AMDGPU/fma.ll
diff --git a/test/CodeGen/R600/fmad.ll → test/CodeGen/AMDGPU/fmad.ll b/test/CodeGen/R600/fmad.ll → test/CodeGen/AMDGPU/fmad.ll
diff --git a/test/CodeGen/R600/fmax.ll → test/CodeGen/AMDGPU/fmax.ll b/test/CodeGen/R600/fmax.ll → test/CodeGen/AMDGPU/fmax.ll
diff --git a/test/CodeGen/R600/fmax3.f64.ll → test/CodeGen/AMDGPU/fmax3.f64.ll b/test/CodeGen/R600/fmax3.f64.ll → test/CodeGen/AMDGPU/fmax3.f64.ll
diff --git a/test/CodeGen/R600/fmax3.ll → test/CodeGen/AMDGPU/fmax3.ll b/test/CodeGen/R600/fmax3.ll → test/CodeGen/AMDGPU/fmax3.ll
diff --git a/test/CodeGen/R600/fmax_legacy.f64.ll → test/CodeGen/AMDGPU/fmax_legacy.f64.ll b/test/CodeGen/R600/fmax_legacy.f64.ll → test/CodeGen/AMDGPU/fmax_legacy.f64.ll
diff --git a/test/CodeGen/R600/fmax_legacy.ll → test/CodeGen/AMDGPU/fmax_legacy.ll b/test/CodeGen/R600/fmax_legacy.ll → test/CodeGen/AMDGPU/fmax_legacy.ll
diff --git a/test/CodeGen/R600/fmaxnum.f64.ll → test/CodeGen/AMDGPU/fmaxnum.f64.ll b/test/CodeGen/R600/fmaxnum.f64.ll → test/CodeGen/AMDGPU/fmaxnum.f64.ll
diff --git a/test/CodeGen/R600/fmaxnum.ll → test/CodeGen/AMDGPU/fmaxnum.ll b/test/CodeGen/R600/fmaxnum.ll → test/CodeGen/AMDGPU/fmaxnum.ll
diff --git a/test/CodeGen/R600/fmin.ll → test/CodeGen/AMDGPU/fmin.ll b/test/CodeGen/R600/fmin.ll → test/CodeGen/AMDGPU/fmin.ll
diff --git a/test/CodeGen/R600/fmin3.ll → test/CodeGen/AMDGPU/fmin3.ll b/test/CodeGen/R600/fmin3.ll → test/CodeGen/AMDGPU/fmin3.ll
diff --git a/test/CodeGen/R600/fmin_legacy.f64.ll → test/CodeGen/AMDGPU/fmin_legacy.f64.ll b/test/CodeGen/R600/fmin_legacy.f64.ll → test/CodeGen/AMDGPU/fmin_legacy.f64.ll
diff --git a/test/CodeGen/R600/fmin_legacy.ll → test/CodeGen/AMDGPU/fmin_legacy.ll b/test/CodeGen/R600/fmin_legacy.ll → test/CodeGen/AMDGPU/fmin_legacy.ll
diff --git a/test/CodeGen/R600/fminnum.f64.ll → test/CodeGen/AMDGPU/fminnum.f64.ll b/test/CodeGen/R600/fminnum.f64.ll → test/CodeGen/AMDGPU/fminnum.f64.ll
diff --git a/test/CodeGen/R600/fminnum.ll → test/CodeGen/AMDGPU/fminnum.ll b/test/CodeGen/R600/fminnum.ll → test/CodeGen/AMDGPU/fminnum.ll
diff --git a/test/CodeGen/R600/fmul.ll → test/CodeGen/AMDGPU/fmul.ll b/test/CodeGen/R600/fmul.ll → test/CodeGen/AMDGPU/fmul.ll
diff --git a/test/CodeGen/R600/fmul64.ll → test/CodeGen/AMDGPU/fmul64.ll b/test/CodeGen/R600/fmul64.ll → test/CodeGen/AMDGPU/fmul64.ll
diff --git a/test/CodeGen/R600/fmuladd.ll → test/CodeGen/AMDGPU/fmuladd.ll b/test/CodeGen/R600/fmuladd.ll → test/CodeGen/AMDGPU/fmuladd.ll
diff --git a/test/CodeGen/R600/fnearbyint.ll → test/CodeGen/AMDGPU/fnearbyint.ll b/test/CodeGen/R600/fnearbyint.ll → test/CodeGen/AMDGPU/fnearbyint.ll
diff --git a/test/CodeGen/R600/fneg-fabs.f64.ll → test/CodeGen/AMDGPU/fneg-fabs.f64.ll b/test/CodeGen/R600/fneg-fabs.f64.ll → test/CodeGen/AMDGPU/fneg-fabs.f64.ll
diff --git a/test/CodeGen/R600/fneg-fabs.ll → test/CodeGen/AMDGPU/fneg-fabs.ll b/test/CodeGen/R600/fneg-fabs.ll → test/CodeGen/AMDGPU/fneg-fabs.ll
diff --git a/test/CodeGen/R600/fneg.f64.ll → test/CodeGen/AMDGPU/fneg.f64.ll b/test/CodeGen/R600/fneg.f64.ll → test/CodeGen/AMDGPU/fneg.f64.ll
diff --git a/test/CodeGen/R600/fneg.ll → test/CodeGen/AMDGPU/fneg.ll b/test/CodeGen/R600/fneg.ll → test/CodeGen/AMDGPU/fneg.ll
diff --git a/test/CodeGen/R600/fp-classify.ll → test/CodeGen/AMDGPU/fp-classify.ll b/test/CodeGen/R600/fp-classify.ll → test/CodeGen/AMDGPU/fp-classify.ll
diff --git a/test/CodeGen/R600/fp16_to_fp.ll → test/CodeGen/AMDGPU/fp16_to_fp.ll b/test/CodeGen/R600/fp16_to_fp.ll → test/CodeGen/AMDGPU/fp16_to_fp.ll
diff --git a/test/CodeGen/R600/fp32_to_fp16.ll → test/CodeGen/AMDGPU/fp32_to_fp16.ll b/test/CodeGen/R600/fp32_to_fp16.ll → test/CodeGen/AMDGPU/fp32_to_fp16.ll
diff --git a/test/CodeGen/R600/fp_to_sint.f64.ll → test/CodeGen/AMDGPU/fp_to_sint.f64.ll b/test/CodeGen/R600/fp_to_sint.f64.ll → test/CodeGen/AMDGPU/fp_to_sint.f64.ll
diff --git a/test/CodeGen/R600/fp_to_sint.ll → test/CodeGen/AMDGPU/fp_to_sint.ll b/test/CodeGen/R600/fp_to_sint.ll → test/CodeGen/AMDGPU/fp_to_sint.ll
diff --git a/test/CodeGen/R600/fp_to_uint.f64.ll → test/CodeGen/AMDGPU/fp_to_uint.f64.ll b/test/CodeGen/R600/fp_to_uint.f64.ll → test/CodeGen/AMDGPU/fp_to_uint.f64.ll
diff --git a/test/CodeGen/R600/fp_to_uint.ll → test/CodeGen/AMDGPU/fp_to_uint.ll b/test/CodeGen/R600/fp_to_uint.ll → test/CodeGen/AMDGPU/fp_to_uint.ll
diff --git a/test/CodeGen/R600/fpext.ll → test/CodeGen/AMDGPU/fpext.ll b/test/CodeGen/R600/fpext.ll → test/CodeGen/AMDGPU/fpext.ll
diff --git a/test/CodeGen/R600/fptrunc.ll → test/CodeGen/AMDGPU/fptrunc.ll b/test/CodeGen/R600/fptrunc.ll → test/CodeGen/AMDGPU/fptrunc.ll
diff --git a/test/CodeGen/R600/frem.ll → test/CodeGen/AMDGPU/frem.ll b/test/CodeGen/R600/frem.ll → test/CodeGen/AMDGPU/frem.ll
diff --git a/test/CodeGen/R600/fsqrt.ll → test/CodeGen/AMDGPU/fsqrt.ll b/test/CodeGen/R600/fsqrt.ll → test/CodeGen/AMDGPU/fsqrt.ll
diff --git a/test/CodeGen/R600/fsub.ll → test/CodeGen/AMDGPU/fsub.ll b/test/CodeGen/R600/fsub.ll → test/CodeGen/AMDGPU/fsub.ll
diff --git a/test/CodeGen/R600/fsub64.ll → test/CodeGen/AMDGPU/fsub64.ll b/test/CodeGen/R600/fsub64.ll → test/CodeGen/AMDGPU/fsub64.ll
diff --git a/test/CodeGen/R600/ftrunc.f64.ll → test/CodeGen/AMDGPU/ftrunc.f64.ll b/test/CodeGen/R600/ftrunc.f64.ll → test/CodeGen/AMDGPU/ftrunc.f64.ll
diff --git a/test/CodeGen/R600/ftrunc.ll → test/CodeGen/AMDGPU/ftrunc.ll b/test/CodeGen/R600/ftrunc.ll → test/CodeGen/AMDGPU/ftrunc.ll
diff --git a/test/CodeGen/R600/gep-address-space.ll → test/CodeGen/AMDGPU/gep-address-space.ll b/test/CodeGen/R600/gep-address-space.ll → test/CodeGen/AMDGPU/gep-address-space.ll
diff --git a/test/CodeGen/R600/global-directive.ll → test/CodeGen/AMDGPU/global-directive.ll b/test/CodeGen/R600/global-directive.ll → test/CodeGen/AMDGPU/global-directive.ll
diff --git a/test/CodeGen/R600/global-extload-i1.ll → test/CodeGen/AMDGPU/global-extload-i1.ll b/test/CodeGen/R600/global-extload-i1.ll → test/CodeGen/AMDGPU/global-extload-i1.ll
diff --git a/test/CodeGen/R600/global-extload-i16.ll → test/CodeGen/AMDGPU/global-extload-i16.ll b/test/CodeGen/R600/global-extload-i16.ll → test/CodeGen/AMDGPU/global-extload-i16.ll
diff --git a/test/CodeGen/R600/global-extload-i32.ll → test/CodeGen/AMDGPU/global-extload-i32.ll b/test/CodeGen/R600/global-extload-i32.ll → test/CodeGen/AMDGPU/global-extload-i32.ll
diff --git a/test/CodeGen/R600/global-extload-i8.ll → test/CodeGen/AMDGPU/global-extload-i8.ll b/test/CodeGen/R600/global-extload-i8.ll → test/CodeGen/AMDGPU/global-extload-i8.ll
diff --git a/test/CodeGen/R600/global-zero-initializer.ll → ...CodeGen/AMDGPU/global-zero-initializer.ll b/test/CodeGen/R600/global-zero-initializer.ll → ...CodeGen/AMDGPU/global-zero-initializer.ll
diff --git a/test/CodeGen/R600/global_atomics.ll → test/CodeGen/AMDGPU/global_atomics.ll b/test/CodeGen/R600/global_atomics.ll → test/CodeGen/AMDGPU/global_atomics.ll
diff --git a/test/CodeGen/R600/gv-const-addrspace-fail.ll → ...CodeGen/AMDGPU/gv-const-addrspace-fail.ll b/test/CodeGen/R600/gv-const-addrspace-fail.ll → ...CodeGen/AMDGPU/gv-const-addrspace-fail.ll
diff --git a/test/CodeGen/R600/gv-const-addrspace.ll → test/CodeGen/AMDGPU/gv-const-addrspace.ll b/test/CodeGen/R600/gv-const-addrspace.ll → test/CodeGen/AMDGPU/gv-const-addrspace.ll
diff --git a/test/CodeGen/R600/half.ll → test/CodeGen/AMDGPU/half.ll b/test/CodeGen/R600/half.ll → test/CodeGen/AMDGPU/half.ll
diff --git a/test/CodeGen/R600/hsa.ll → test/CodeGen/AMDGPU/hsa.ll b/test/CodeGen/R600/hsa.ll → test/CodeGen/AMDGPU/hsa.ll
diff --git a/test/CodeGen/R600/i1-copy-implicit-def.ll → test/CodeGen/AMDGPU/i1-copy-implicit-def.ll b/test/CodeGen/R600/i1-copy-implicit-def.ll → test/CodeGen/AMDGPU/i1-copy-implicit-def.ll
diff --git a/test/CodeGen/R600/i1-copy-phi.ll → test/CodeGen/AMDGPU/i1-copy-phi.ll b/test/CodeGen/R600/i1-copy-phi.ll → test/CodeGen/AMDGPU/i1-copy-phi.ll
diff --git a/test/CodeGen/R600/i8-to-double-to-float.ll → test/CodeGen/AMDGPU/i8-to-double-to-float.ll b/test/CodeGen/R600/i8-to-double-to-float.ll → test/CodeGen/AMDGPU/i8-to-double-to-float.ll
diff --git a/...Gen/R600/icmp-select-sete-reverse-args.ll → ...n/AMDGPU/icmp-select-sete-reverse-args.ll b/...Gen/R600/icmp-select-sete-reverse-args.ll → ...n/AMDGPU/icmp-select-sete-reverse-args.ll
diff --git a/test/CodeGen/R600/icmp64.ll → test/CodeGen/AMDGPU/icmp64.ll b/test/CodeGen/R600/icmp64.ll → test/CodeGen/AMDGPU/icmp64.ll
diff --git a/test/CodeGen/R600/imm.ll → test/CodeGen/AMDGPU/imm.ll b/test/CodeGen/R600/imm.ll → test/CodeGen/AMDGPU/imm.ll
diff --git a/test/CodeGen/R600/indirect-addressing-si.ll → .../CodeGen/AMDGPU/indirect-addressing-si.ll b/test/CodeGen/R600/indirect-addressing-si.ll → .../CodeGen/AMDGPU/indirect-addressing-si.ll
diff --git a/test/CodeGen/R600/indirect-private-64.ll → test/CodeGen/AMDGPU/indirect-private-64.ll b/test/CodeGen/R600/indirect-private-64.ll → test/CodeGen/AMDGPU/indirect-private-64.ll
diff --git a/test/CodeGen/R600/infinite-loop-evergreen.ll → ...CodeGen/AMDGPU/infinite-loop-evergreen.ll b/test/CodeGen/R600/infinite-loop-evergreen.ll → ...CodeGen/AMDGPU/infinite-loop-evergreen.ll
diff --git a/test/CodeGen/R600/infinite-loop.ll → test/CodeGen/AMDGPU/infinite-loop.ll b/test/CodeGen/R600/infinite-loop.ll → test/CodeGen/AMDGPU/infinite-loop.ll
diff --git a/test/CodeGen/R600/inline-asm.ll → test/CodeGen/AMDGPU/inline-asm.ll b/test/CodeGen/R600/inline-asm.ll → test/CodeGen/AMDGPU/inline-asm.ll
diff --git a/test/CodeGen/R600/inline-calls.ll → test/CodeGen/AMDGPU/inline-calls.ll b/test/CodeGen/R600/inline-calls.ll → test/CodeGen/AMDGPU/inline-calls.ll
diff --git a/test/CodeGen/R600/input-mods.ll → test/CodeGen/AMDGPU/input-mods.ll b/test/CodeGen/R600/input-mods.ll → test/CodeGen/AMDGPU/input-mods.ll
diff --git a/test/CodeGen/R600/insert_subreg.ll → test/CodeGen/AMDGPU/insert_subreg.ll b/test/CodeGen/R600/insert_subreg.ll → test/CodeGen/AMDGPU/insert_subreg.ll
diff --git a/test/CodeGen/R600/insert_vector_elt.ll → test/CodeGen/AMDGPU/insert_vector_elt.ll b/test/CodeGen/R600/insert_vector_elt.ll → test/CodeGen/AMDGPU/insert_vector_elt.ll
diff --git a/test/CodeGen/R600/jump-address.ll → test/CodeGen/AMDGPU/jump-address.ll b/test/CodeGen/R600/jump-address.ll → test/CodeGen/AMDGPU/jump-address.ll
diff --git a/test/CodeGen/R600/kcache-fold.ll → test/CodeGen/AMDGPU/kcache-fold.ll b/test/CodeGen/R600/kcache-fold.ll → test/CodeGen/AMDGPU/kcache-fold.ll
diff --git a/test/CodeGen/R600/kernel-args.ll → test/CodeGen/AMDGPU/kernel-args.ll b/test/CodeGen/R600/kernel-args.ll → test/CodeGen/AMDGPU/kernel-args.ll
diff --git a/test/CodeGen/R600/large-alloca.ll → test/CodeGen/AMDGPU/large-alloca.ll b/test/CodeGen/R600/large-alloca.ll → test/CodeGen/AMDGPU/large-alloca.ll
diff --git a/...odeGen/R600/large-constant-initializer.ll → ...eGen/AMDGPU/large-constant-initializer.ll b/...odeGen/R600/large-constant-initializer.ll → ...eGen/AMDGPU/large-constant-initializer.ll
diff --git a/test/CodeGen/R600/lds-initializer.ll → test/CodeGen/AMDGPU/lds-initializer.ll b/test/CodeGen/R600/lds-initializer.ll → test/CodeGen/AMDGPU/lds-initializer.ll
diff --git a/test/CodeGen/R600/lds-oqap-crash.ll → test/CodeGen/AMDGPU/lds-oqap-crash.ll b/test/CodeGen/R600/lds-oqap-crash.ll → test/CodeGen/AMDGPU/lds-oqap-crash.ll
diff --git a/test/CodeGen/R600/lds-output-queue.ll → test/CodeGen/AMDGPU/lds-output-queue.ll b/test/CodeGen/R600/lds-output-queue.ll → test/CodeGen/AMDGPU/lds-output-queue.ll
diff --git a/test/CodeGen/R600/lds-size.ll → test/CodeGen/AMDGPU/lds-size.ll b/test/CodeGen/R600/lds-size.ll → test/CodeGen/AMDGPU/lds-size.ll
diff --git a/test/CodeGen/R600/lds-zero-initializer.ll → test/CodeGen/AMDGPU/lds-zero-initializer.ll b/test/CodeGen/R600/lds-zero-initializer.ll → test/CodeGen/AMDGPU/lds-zero-initializer.ll
diff --git a/...eGen/R600/legalizedag-bug-expand-setcc.ll → ...en/AMDGPU/legalizedag-bug-expand-setcc.ll b/...eGen/R600/legalizedag-bug-expand-setcc.ll → ...en/AMDGPU/legalizedag-bug-expand-setcc.ll
diff --git a/test/CodeGen/AMDGPU/lit.local.cfg b/test/CodeGen/AMDGPU/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'AMDGPU' in config.root.targets:
+    config.unsupported = True
diff --git a/test/CodeGen/R600/literals.ll → test/CodeGen/AMDGPU/literals.ll b/test/CodeGen/R600/literals.ll → test/CodeGen/AMDGPU/literals.ll
diff --git a/test/CodeGen/R600/llvm.AMDGPU.abs.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.abs.ll b/test/CodeGen/R600/llvm.AMDGPU.abs.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.abs.ll
diff --git a/...odeGen/R600/llvm.AMDGPU.barrier.global.ll → ...eGen/AMDGPU/llvm.AMDGPU.barrier.global.ll b/...odeGen/R600/llvm.AMDGPU.barrier.global.ll → ...eGen/AMDGPU/llvm.AMDGPU.barrier.global.ll
diff --git a/...CodeGen/R600/llvm.AMDGPU.barrier.local.ll → ...deGen/AMDGPU/llvm.AMDGPU.barrier.local.ll b/...CodeGen/R600/llvm.AMDGPU.barrier.local.ll → ...deGen/AMDGPU/llvm.AMDGPU.barrier.local.ll
diff --git a/test/CodeGen/R600/llvm.AMDGPU.bfe.i32.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.i32.ll b/test/CodeGen/R600/llvm.AMDGPU.bfe.i32.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.i32.ll
diff --git a/test/CodeGen/R600/llvm.AMDGPU.bfe.u32.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.u32.ll b/test/CodeGen/R600/llvm.AMDGPU.bfe.u32.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.u32.ll
diff --git a/test/CodeGen/R600/llvm.AMDGPU.bfi.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.bfi.ll b/test/CodeGen/R600/llvm.AMDGPU.bfi.ll → test/CodeGen/AMDGPU/llvm.AMDGPU.bfi.ll
-Original file line number
+Diff line change
@@ Expand Up / @@ -176,6 +176,7 @@ set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) @@
     set(LLVM_ALL_TARGETS
       AArch64
+      AMDGPU
       ARM
       BPF
       CppBackend
@@ Expand All / @@ -184,7 +185,6 @@ set(LLVM_ALL_TARGETS @@
       MSP430
       NVPTX
       PowerPC
-      R600
       Sparc
       SystemZ
       X86
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		if not 'AMDGPU' in config.root.targets:
		config.unsupported = True