R600 -> AMDGPU rename

llvm-svn: 239657

diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 026fe47..da73149 100644 (file)
--- a/llvm/CMakeLists.txt
+++ b/llvm/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/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index 11ba051..5b70fbd 100644 (file)
--- a/llvm/autoconf/configure.ac
+++ b/llvm/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/llvm/configure b/llvm/configure
index 6cb9f2d..73fce67 100755 (executable)
--- a/llvm/configure
+++ b/llvm/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/llvm/docs/R600Usage.rst b/llvm/docs/AMDGPUUsage.rst
similarity index 91%
rename from llvm/docs/R600Usage.rst
rename to llvm/docs/AMDGPUUsage.rst
index 9bd16f4..3cb41ce 100644 (file)
--- a/llvm/docs/R600Usage.rst
+++ b/llvm/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/llvm/docs/CompilerWriterInfo.rst b/llvm/docs/CompilerWriterInfo.rst
index 2dfdc9b..900ba24 100644 (file)
--- a/llvm/docs/CompilerWriterInfo.rst
+++ b/llvm/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/llvm/docs/GettingStarted.rst b/llvm/docs/GettingStarted.rst
index 18b3c1d..212fa0b 100644 (file)
--- a/llvm/docs/GettingStarted.rst
+++ b/llvm/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/llvm/docs/index.rst b/llvm/docs/index.rst
index 2cc5b8b..0b68118 100644 (file)
--- a/llvm/docs/index.rst
+++ b/llvm/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/llvm/lib/Target/R600/AMDGPU.h b/llvm/lib/Target/AMDGPU/AMDGPU.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPU.h
rename to llvm/lib/Target/AMDGPU/AMDGPU.h

diff --git a/llvm/lib/Target/R600/AMDGPU.td b/llvm/lib/Target/AMDGPU/AMDGPU.td
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPU.td
rename to llvm/lib/Target/AMDGPU/AMDGPU.td

diff --git a/llvm/lib/Target/R600/AMDGPUAlwaysInlinePass.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAlwaysInlinePass.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUAlwaysInlinePass.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUAlwaysInlinePass.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp b/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
similarity index 99%
rename from llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp
index 56b50a9..29c2da6 100644 (file)
--- a/llvm/lib/Target/R600/AMDGPUAsmPrinter.cpp
+++ b/llvm/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/llvm/lib/Target/R600/AMDGPUAsmPrinter.h b/llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUAsmPrinter.h
rename to llvm/lib/Target/AMDGPU/AMDGPUAsmPrinter.h

diff --git a/llvm/lib/Target/R600/AMDGPUCallingConv.td b/llvm/lib/Target/AMDGPU/AMDGPUCallingConv.td
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUCallingConv.td
rename to llvm/lib/Target/AMDGPU/AMDGPUCallingConv.td

diff --git a/llvm/lib/Target/R600/AMDGPUFrameLowering.cpp b/llvm/lib/Target/AMDGPU/AMDGPUFrameLowering.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUFrameLowering.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUFrameLowering.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUFrameLowering.h b/llvm/lib/Target/AMDGPU/AMDGPUFrameLowering.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUFrameLowering.h
rename to llvm/lib/Target/AMDGPU/AMDGPUFrameLowering.h

diff --git a/llvm/lib/Target/R600/AMDGPUISelDAGToDAG.cpp b/llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUISelDAGToDAG.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUISelLowering.cpp b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUISelLowering.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUISelLowering.h b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUISelLowering.h
rename to llvm/lib/Target/AMDGPU/AMDGPUISelLowering.h

diff --git a/llvm/lib/Target/R600/AMDGPUInstrInfo.cpp b/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUInstrInfo.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUInstrInfo.h b/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUInstrInfo.h
rename to llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.h

diff --git a/llvm/lib/Target/R600/AMDGPUInstrInfo.td b/llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.td
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUInstrInfo.td
rename to llvm/lib/Target/AMDGPU/AMDGPUInstrInfo.td

diff --git a/llvm/lib/Target/R600/AMDGPUInstructions.td b/llvm/lib/Target/AMDGPU/AMDGPUInstructions.td
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUInstructions.td
rename to llvm/lib/Target/AMDGPU/AMDGPUInstructions.td

diff --git a/llvm/lib/Target/R600/AMDGPUIntrinsicInfo.cpp b/llvm/lib/Target/AMDGPU/AMDGPUIntrinsicInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUIntrinsicInfo.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUIntrinsicInfo.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUIntrinsicInfo.h b/llvm/lib/Target/AMDGPU/AMDGPUIntrinsicInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUIntrinsicInfo.h
rename to llvm/lib/Target/AMDGPU/AMDGPUIntrinsicInfo.h

diff --git a/llvm/lib/Target/R600/AMDGPUIntrinsics.td b/llvm/lib/Target/AMDGPU/AMDGPUIntrinsics.td
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUIntrinsics.td
rename to llvm/lib/Target/AMDGPU/AMDGPUIntrinsics.td

diff --git a/llvm/lib/Target/R600/AMDGPUMCInstLower.cpp b/llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUMCInstLower.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUMCInstLower.h b/llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUMCInstLower.h
rename to llvm/lib/Target/AMDGPU/AMDGPUMCInstLower.h

diff --git a/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp b/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUMachineFunction.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUMachineFunction.h b/llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUMachineFunction.h
rename to llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.h

diff --git a/llvm/lib/Target/R600/AMDGPUPromoteAlloca.cpp b/llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUPromoteAlloca.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp

diff --git a/llvm/lib/Target/R600/AMDGPURegisterInfo.cpp b/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPURegisterInfo.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.cpp

diff --git a/llvm/lib/Target/R600/AMDGPURegisterInfo.h b/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPURegisterInfo.h
rename to llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.h

diff --git a/llvm/lib/Target/R600/AMDGPURegisterInfo.td b/llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPURegisterInfo.td
rename to llvm/lib/Target/AMDGPU/AMDGPURegisterInfo.td

diff --git a/llvm/lib/Target/R600/AMDGPUSubtarget.cpp b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUSubtarget.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUSubtarget.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUSubtarget.h b/llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUSubtarget.h
rename to llvm/lib/Target/AMDGPU/AMDGPUSubtarget.h

diff --git a/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
similarity index 99%
rename from llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp
index d65c010..a9a911a 100644 (file)
--- a/llvm/lib/Target/R600/AMDGPUTargetMachine.cpp
+++ b/llvm/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/llvm/lib/Target/R600/AMDGPUTargetMachine.h b/llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUTargetMachine.h
rename to llvm/lib/Target/AMDGPU/AMDGPUTargetMachine.h

diff --git a/llvm/lib/Target/R600/AMDGPUTargetTransformInfo.cpp b/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUTargetTransformInfo.cpp
rename to llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.cpp

diff --git a/llvm/lib/Target/R600/AMDGPUTargetTransformInfo.h b/llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDGPUTargetTransformInfo.h
rename to llvm/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h

diff --git a/llvm/lib/Target/R600/AMDILCFGStructurizer.cpp b/llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp
similarity index 100%
rename from llvm/lib/Target/R600/AMDILCFGStructurizer.cpp
rename to llvm/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp

diff --git a/llvm/lib/Target/R600/AMDKernelCodeT.h b/llvm/lib/Target/AMDGPU/AMDKernelCodeT.h
similarity index 100%
rename from llvm/lib/Target/R600/AMDKernelCodeT.h
rename to llvm/lib/Target/AMDGPU/AMDKernelCodeT.h

diff --git a/llvm/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp b/llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
similarity index 99%
rename from llvm/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp
rename to llvm/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp
index 02a6360..0c9a688 100644 (file)
--- a/llvm/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp
+++ b/llvm/lib/Target/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/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt b/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt
new file mode 100644 (file)
index 0000000..21ddc4e
--- /dev/null
+++ b/llvm/lib/Target/AMDGPU/AsmParser/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_llvm_library(LLVMAMDGPUAsmParser
+  AMDGPUAsmParser.cpp
+  )

diff --git a/llvm/lib/Target/R600/AsmParser/LLVMBuild.txt b/llvm/lib/Target/AMDGPU/AsmParser/LLVMBuild.txt
similarity index 72%
rename from llvm/lib/Target/R600/AsmParser/LLVMBuild.txt
rename to llvm/lib/Target/AMDGPU/AsmParser/LLVMBuild.txt
index 940e4ce..63d44d1 100644 (file)
--- a/llvm/lib/Target/R600/AsmParser/LLVMBuild.txt
+++ b/llvm/lib/Target/AMDGPU/AsmParser/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/R600/AsmParser/LLVMBuild.txt -------------*- Conf -*--===;
+;===- ./lib/Target/AMDGPU/AsmParser/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 = AMDGPUAsmParser
+parent = AMDGPU
+required_libraries = MC MCParser AMDGPUDesc AMDGPUInfo Support
+add_to_library_groups = AMDGPU

diff --git a/llvm/lib/Target/R600/AsmParser/Makefile b/llvm/lib/Target/AMDGPU/AsmParser/Makefile
similarity index 100%
rename from llvm/lib/Target/R600/AsmParser/Makefile
rename to llvm/lib/Target/AMDGPU/AsmParser/Makefile

diff --git a/llvm/lib/Target/R600/CIInstructions.td b/llvm/lib/Target/AMDGPU/CIInstructions.td
similarity index 100%
rename from llvm/lib/Target/R600/CIInstructions.td
rename to llvm/lib/Target/AMDGPU/CIInstructions.td

diff --git a/llvm/lib/Target/R600/CMakeLists.txt b/llvm/lib/Target/AMDGPU/CMakeLists.txt
similarity index 98%
rename from llvm/lib/Target/R600/CMakeLists.txt
rename to llvm/lib/Target/AMDGPU/CMakeLists.txt
index 3c1bc49..3e5ff1f 100644 (file)
--- a/llvm/lib/Target/R600/CMakeLists.txt
+++ b/llvm/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/llvm/lib/Target/R600/CaymanInstructions.td b/llvm/lib/Target/AMDGPU/CaymanInstructions.td
similarity index 100%
rename from llvm/lib/Target/R600/CaymanInstructions.td
rename to llvm/lib/Target/AMDGPU/CaymanInstructions.td

diff --git a/llvm/lib/Target/R600/EvergreenInstructions.td b/llvm/lib/Target/AMDGPU/EvergreenInstructions.td
similarity index 100%
rename from llvm/lib/Target/R600/EvergreenInstructions.td
rename to llvm/lib/Target/AMDGPU/EvergreenInstructions.td

diff --git a/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp b/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp
similarity index 100%
rename from llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp
rename to llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp

diff --git a/llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h b/llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.h
similarity index 100%
rename from llvm/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h
rename to llvm/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.h

diff --git a/llvm/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt b/llvm/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ce63bd5
--- /dev/null
+++ b/llvm/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_llvm_library(LLVMAMDGPUAsmPrinter
+  AMDGPUInstPrinter.cpp
+  )

diff --git a/llvm/lib/Target/R600/InstPrinter/LLVMBuild.txt b/llvm/lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt
similarity index 79%
rename from llvm/lib/Target/R600/InstPrinter/LLVMBuild.txt
rename to llvm/lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt
index ec0be89..fdb4384 100644 (file)
--- a/llvm/lib/Target/R600/InstPrinter/LLVMBuild.txt
+++ b/llvm/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/llvm/lib/Target/R600/InstPrinter/Makefile b/llvm/lib/Target/AMDGPU/InstPrinter/Makefile
similarity index 100%
rename from llvm/lib/Target/R600/InstPrinter/Makefile
rename to llvm/lib/Target/AMDGPU/InstPrinter/Makefile

diff --git a/llvm/lib/Target/R600/LLVMBuild.txt b/llvm/lib/Target/AMDGPU/LLVMBuild.txt
similarity index 76%
rename from llvm/lib/Target/R600/LLVMBuild.txt
rename to llvm/lib/Target/AMDGPU/LLVMBuild.txt
index f3f254f..c6861df 100644 (file)
--- a/llvm/lib/Target/R600/LLVMBuild.txt
+++ b/llvm/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/llvm/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp

diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp

diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUFixupKinds.h b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUFixupKinds.h
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUFixupKinds.h
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUFixupKinds.h

diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp

diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.h b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.h
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h

diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.cpp
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp

diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h

diff --git a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp
similarity index 98%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp
index 02192c4..a7d3dd1 100644 (file)
--- a/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp
+++ b/llvm/lib/Target/AMDGPU/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/llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h b/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h

diff --git a/llvm/lib/Target/R600/MCTargetDesc/CMakeLists.txt b/llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt
similarity index 84%
rename from llvm/lib/Target/R600/MCTargetDesc/CMakeLists.txt
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt
index 801c905..151d0d5 100644 (file)
--- a/llvm/lib/Target/R600/MCTargetDesc/CMakeLists.txt
+++ b/llvm/lib/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/llvm/lib/Target/R600/MCTargetDesc/LLVMBuild.txt b/llvm/lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt
similarity index 72%
rename from llvm/lib/Target/R600/MCTargetDesc/LLVMBuild.txt
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt
index 74b8ca0..4217bb3 100644 (file)
--- a/llvm/lib/Target/R600/MCTargetDesc/LLVMBuild.txt
+++ b/llvm/lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt
@@ -1,4 +1,4 @@
-;===- ./lib/Target/R600/MCTargetDesc/LLVMBuild.txt -------------*- Conf -*--===;
+;===- ./lib/Target/AMDGPU/MCTargetDesc/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 = AMDGPUDesc
+parent = AMDGPU
+required_libraries = MC AMDGPUAsmPrinter AMDGPUInfo Support
+add_to_library_groups = AMDGPU

diff --git a/llvm/lib/Target/R600/MCTargetDesc/Makefile b/llvm/lib/Target/AMDGPU/MCTargetDesc/Makefile
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/Makefile
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/Makefile

diff --git a/llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp

diff --git a/llvm/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp b/llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp
similarity index 100%
rename from llvm/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp
rename to llvm/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp

diff --git a/llvm/lib/Target/R600/Makefile b/llvm/lib/Target/AMDGPU/Makefile
similarity index 100%
rename from llvm/lib/Target/R600/Makefile
rename to llvm/lib/Target/AMDGPU/Makefile

diff --git a/llvm/lib/Target/R600/Processors.td b/llvm/lib/Target/AMDGPU/Processors.td
similarity index 100%
rename from llvm/lib/Target/R600/Processors.td
rename to llvm/lib/Target/AMDGPU/Processors.td

diff --git a/llvm/lib/Target/R600/R600ClauseMergePass.cpp b/llvm/lib/Target/AMDGPU/R600ClauseMergePass.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600ClauseMergePass.cpp
rename to llvm/lib/Target/AMDGPU/R600ClauseMergePass.cpp

diff --git a/llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp b/llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600ControlFlowFinalizer.cpp
rename to llvm/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp

diff --git a/llvm/lib/Target/R600/R600Defines.h b/llvm/lib/Target/AMDGPU/R600Defines.h
similarity index 100%
rename from llvm/lib/Target/R600/R600Defines.h
rename to llvm/lib/Target/AMDGPU/R600Defines.h

diff --git a/llvm/lib/Target/R600/R600EmitClauseMarkers.cpp b/llvm/lib/Target/AMDGPU/R600EmitClauseMarkers.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600EmitClauseMarkers.cpp
rename to llvm/lib/Target/AMDGPU/R600EmitClauseMarkers.cpp

diff --git a/llvm/lib/Target/R600/R600ExpandSpecialInstrs.cpp b/llvm/lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600ExpandSpecialInstrs.cpp
rename to llvm/lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp

diff --git a/llvm/lib/Target/R600/R600ISelLowering.cpp b/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600ISelLowering.cpp
rename to llvm/lib/Target/AMDGPU/R600ISelLowering.cpp

diff --git a/llvm/lib/Target/R600/R600ISelLowering.h b/llvm/lib/Target/AMDGPU/R600ISelLowering.h
similarity index 100%
rename from llvm/lib/Target/R600/R600ISelLowering.h
rename to llvm/lib/Target/AMDGPU/R600ISelLowering.h

diff --git a/llvm/lib/Target/R600/R600InstrFormats.td b/llvm/lib/Target/AMDGPU/R600InstrFormats.td
similarity index 100%
rename from llvm/lib/Target/R600/R600InstrFormats.td
rename to llvm/lib/Target/AMDGPU/R600InstrFormats.td

diff --git a/llvm/lib/Target/R600/R600InstrInfo.cpp b/llvm/lib/Target/AMDGPU/R600InstrInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600InstrInfo.cpp
rename to llvm/lib/Target/AMDGPU/R600InstrInfo.cpp

diff --git a/llvm/lib/Target/R600/R600InstrInfo.h b/llvm/lib/Target/AMDGPU/R600InstrInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/R600InstrInfo.h
rename to llvm/lib/Target/AMDGPU/R600InstrInfo.h

diff --git a/llvm/lib/Target/R600/R600Instructions.td b/llvm/lib/Target/AMDGPU/R600Instructions.td
similarity index 100%
rename from llvm/lib/Target/R600/R600Instructions.td
rename to llvm/lib/Target/AMDGPU/R600Instructions.td

diff --git a/llvm/lib/Target/R600/R600Intrinsics.td b/llvm/lib/Target/AMDGPU/R600Intrinsics.td
similarity index 100%
rename from llvm/lib/Target/R600/R600Intrinsics.td
rename to llvm/lib/Target/AMDGPU/R600Intrinsics.td

diff --git a/llvm/lib/Target/R600/R600MachineFunctionInfo.cpp b/llvm/lib/Target/AMDGPU/R600MachineFunctionInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600MachineFunctionInfo.cpp
rename to llvm/lib/Target/AMDGPU/R600MachineFunctionInfo.cpp

diff --git a/llvm/lib/Target/R600/R600MachineFunctionInfo.h b/llvm/lib/Target/AMDGPU/R600MachineFunctionInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/R600MachineFunctionInfo.h
rename to llvm/lib/Target/AMDGPU/R600MachineFunctionInfo.h

diff --git a/llvm/lib/Target/R600/R600MachineScheduler.cpp b/llvm/lib/Target/AMDGPU/R600MachineScheduler.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600MachineScheduler.cpp
rename to llvm/lib/Target/AMDGPU/R600MachineScheduler.cpp

diff --git a/llvm/lib/Target/R600/R600MachineScheduler.h b/llvm/lib/Target/AMDGPU/R600MachineScheduler.h
similarity index 100%
rename from llvm/lib/Target/R600/R600MachineScheduler.h
rename to llvm/lib/Target/AMDGPU/R600MachineScheduler.h

diff --git a/llvm/lib/Target/R600/R600OptimizeVectorRegisters.cpp b/llvm/lib/Target/AMDGPU/R600OptimizeVectorRegisters.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600OptimizeVectorRegisters.cpp
rename to llvm/lib/Target/AMDGPU/R600OptimizeVectorRegisters.cpp

diff --git a/llvm/lib/Target/R600/R600Packetizer.cpp b/llvm/lib/Target/AMDGPU/R600Packetizer.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600Packetizer.cpp
rename to llvm/lib/Target/AMDGPU/R600Packetizer.cpp

diff --git a/llvm/lib/Target/R600/R600RegisterInfo.cpp b/llvm/lib/Target/AMDGPU/R600RegisterInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600RegisterInfo.cpp
rename to llvm/lib/Target/AMDGPU/R600RegisterInfo.cpp

diff --git a/llvm/lib/Target/R600/R600RegisterInfo.h b/llvm/lib/Target/AMDGPU/R600RegisterInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/R600RegisterInfo.h
rename to llvm/lib/Target/AMDGPU/R600RegisterInfo.h

diff --git a/llvm/lib/Target/R600/R600RegisterInfo.td b/llvm/lib/Target/AMDGPU/R600RegisterInfo.td
similarity index 100%
rename from llvm/lib/Target/R600/R600RegisterInfo.td
rename to llvm/lib/Target/AMDGPU/R600RegisterInfo.td

diff --git a/llvm/lib/Target/R600/R600Schedule.td b/llvm/lib/Target/AMDGPU/R600Schedule.td
similarity index 100%
rename from llvm/lib/Target/R600/R600Schedule.td
rename to llvm/lib/Target/AMDGPU/R600Schedule.td

diff --git a/llvm/lib/Target/R600/R600TextureIntrinsicsReplacer.cpp b/llvm/lib/Target/AMDGPU/R600TextureIntrinsicsReplacer.cpp
similarity index 100%
rename from llvm/lib/Target/R600/R600TextureIntrinsicsReplacer.cpp
rename to llvm/lib/Target/AMDGPU/R600TextureIntrinsicsReplacer.cpp

diff --git a/llvm/lib/Target/R600/R700Instructions.td b/llvm/lib/Target/AMDGPU/R700Instructions.td
similarity index 100%
rename from llvm/lib/Target/R600/R700Instructions.td
rename to llvm/lib/Target/AMDGPU/R700Instructions.td

diff --git a/llvm/lib/Target/R600/SIAnnotateControlFlow.cpp b/llvm/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIAnnotateControlFlow.cpp
rename to llvm/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp

diff --git a/llvm/lib/Target/R600/SIDefines.h b/llvm/lib/Target/AMDGPU/SIDefines.h
similarity index 100%
rename from llvm/lib/Target/R600/SIDefines.h
rename to llvm/lib/Target/AMDGPU/SIDefines.h

diff --git a/llvm/lib/Target/R600/SIFixControlFlowLiveIntervals.cpp b/llvm/lib/Target/AMDGPU/SIFixControlFlowLiveIntervals.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIFixControlFlowLiveIntervals.cpp
rename to llvm/lib/Target/AMDGPU/SIFixControlFlowLiveIntervals.cpp

diff --git a/llvm/lib/Target/R600/SIFixSGPRCopies.cpp b/llvm/lib/Target/AMDGPU/SIFixSGPRCopies.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIFixSGPRCopies.cpp
rename to llvm/lib/Target/AMDGPU/SIFixSGPRCopies.cpp

diff --git a/llvm/lib/Target/R600/SIFixSGPRLiveRanges.cpp b/llvm/lib/Target/AMDGPU/SIFixSGPRLiveRanges.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIFixSGPRLiveRanges.cpp
rename to llvm/lib/Target/AMDGPU/SIFixSGPRLiveRanges.cpp

diff --git a/llvm/lib/Target/R600/SIFoldOperands.cpp b/llvm/lib/Target/AMDGPU/SIFoldOperands.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIFoldOperands.cpp
rename to llvm/lib/Target/AMDGPU/SIFoldOperands.cpp

diff --git a/llvm/lib/Target/R600/SIISelLowering.cpp b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIISelLowering.cpp
rename to llvm/lib/Target/AMDGPU/SIISelLowering.cpp

diff --git a/llvm/lib/Target/R600/SIISelLowering.h b/llvm/lib/Target/AMDGPU/SIISelLowering.h
similarity index 100%
rename from llvm/lib/Target/R600/SIISelLowering.h
rename to llvm/lib/Target/AMDGPU/SIISelLowering.h

diff --git a/llvm/lib/Target/R600/SIInsertWaits.cpp b/llvm/lib/Target/AMDGPU/SIInsertWaits.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIInsertWaits.cpp
rename to llvm/lib/Target/AMDGPU/SIInsertWaits.cpp

diff --git a/llvm/lib/Target/R600/SIInstrFormats.td b/llvm/lib/Target/AMDGPU/SIInstrFormats.td
similarity index 100%
rename from llvm/lib/Target/R600/SIInstrFormats.td
rename to llvm/lib/Target/AMDGPU/SIInstrFormats.td

diff --git a/llvm/lib/Target/R600/SIInstrInfo.cpp b/llvm/lib/Target/AMDGPU/SIInstrInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIInstrInfo.cpp
rename to llvm/lib/Target/AMDGPU/SIInstrInfo.cpp

diff --git a/llvm/lib/Target/R600/SIInstrInfo.h b/llvm/lib/Target/AMDGPU/SIInstrInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/SIInstrInfo.h
rename to llvm/lib/Target/AMDGPU/SIInstrInfo.h

diff --git a/llvm/lib/Target/R600/SIInstrInfo.td b/llvm/lib/Target/AMDGPU/SIInstrInfo.td
similarity index 100%
rename from llvm/lib/Target/R600/SIInstrInfo.td
rename to llvm/lib/Target/AMDGPU/SIInstrInfo.td

diff --git a/llvm/lib/Target/R600/SIInstructions.td b/llvm/lib/Target/AMDGPU/SIInstructions.td
similarity index 100%
rename from llvm/lib/Target/R600/SIInstructions.td
rename to llvm/lib/Target/AMDGPU/SIInstructions.td

diff --git a/llvm/lib/Target/R600/SIIntrinsics.td b/llvm/lib/Target/AMDGPU/SIIntrinsics.td
similarity index 100%
rename from llvm/lib/Target/R600/SIIntrinsics.td
rename to llvm/lib/Target/AMDGPU/SIIntrinsics.td

diff --git a/llvm/lib/Target/R600/SILoadStoreOptimizer.cpp b/llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SILoadStoreOptimizer.cpp
rename to llvm/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp

diff --git a/llvm/lib/Target/R600/SILowerControlFlow.cpp b/llvm/lib/Target/AMDGPU/SILowerControlFlow.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SILowerControlFlow.cpp
rename to llvm/lib/Target/AMDGPU/SILowerControlFlow.cpp

diff --git a/llvm/lib/Target/R600/SILowerI1Copies.cpp b/llvm/lib/Target/AMDGPU/SILowerI1Copies.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SILowerI1Copies.cpp
rename to llvm/lib/Target/AMDGPU/SILowerI1Copies.cpp

diff --git a/llvm/lib/Target/R600/SIMachineFunctionInfo.cpp b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIMachineFunctionInfo.cpp
rename to llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp

diff --git a/llvm/lib/Target/R600/SIMachineFunctionInfo.h b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/SIMachineFunctionInfo.h
rename to llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h

diff --git a/llvm/lib/Target/R600/SIPrepareScratchRegs.cpp b/llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIPrepareScratchRegs.cpp
rename to llvm/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp

diff --git a/llvm/lib/Target/R600/SIRegisterInfo.cpp b/llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIRegisterInfo.cpp
rename to llvm/lib/Target/AMDGPU/SIRegisterInfo.cpp

diff --git a/llvm/lib/Target/R600/SIRegisterInfo.h b/llvm/lib/Target/AMDGPU/SIRegisterInfo.h
similarity index 100%
rename from llvm/lib/Target/R600/SIRegisterInfo.h
rename to llvm/lib/Target/AMDGPU/SIRegisterInfo.h

diff --git a/llvm/lib/Target/R600/SIRegisterInfo.td b/llvm/lib/Target/AMDGPU/SIRegisterInfo.td
similarity index 100%
rename from llvm/lib/Target/R600/SIRegisterInfo.td
rename to llvm/lib/Target/AMDGPU/SIRegisterInfo.td

diff --git a/llvm/lib/Target/R600/SISchedule.td b/llvm/lib/Target/AMDGPU/SISchedule.td
similarity index 100%
rename from llvm/lib/Target/R600/SISchedule.td
rename to llvm/lib/Target/AMDGPU/SISchedule.td

diff --git a/llvm/lib/Target/R600/SIShrinkInstructions.cpp b/llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SIShrinkInstructions.cpp
rename to llvm/lib/Target/AMDGPU/SIShrinkInstructions.cpp

diff --git a/llvm/lib/Target/R600/SITypeRewriter.cpp b/llvm/lib/Target/AMDGPU/SITypeRewriter.cpp
similarity index 100%
rename from llvm/lib/Target/R600/SITypeRewriter.cpp
rename to llvm/lib/Target/AMDGPU/SITypeRewriter.cpp

diff --git a/llvm/lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp b/llvm/lib/Target/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp
similarity index 95%
rename from llvm/lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp
rename to llvm/lib/Target/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp
index d723d6e..2112135 100644 (file)
--- a/llvm/lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp
+++ b/llvm/lib/Target/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/llvm/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt b/llvm/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt
new file mode 100644 (file)
index 0000000..961dc55
--- /dev/null
+++ b/llvm/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt
@@ -0,0 +1,3 @@
+add_llvm_library(LLVMAMDGPUInfo
+  AMDGPUTargetInfo.cpp
+  )

diff --git a/llvm/lib/Target/R600/TargetInfo/LLVMBuild.txt b/llvm/lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt
similarity index 79%
rename from llvm/lib/Target/R600/TargetInfo/LLVMBuild.txt
rename to llvm/lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt
index c3d3cf5..291317f 100644 (file)
--- a/llvm/lib/Target/R600/TargetInfo/LLVMBuild.txt
+++ b/llvm/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/llvm/lib/Target/R600/TargetInfo/Makefile b/llvm/lib/Target/AMDGPU/TargetInfo/Makefile
similarity index 100%
rename from llvm/lib/Target/R600/TargetInfo/Makefile
rename to llvm/lib/Target/AMDGPU/TargetInfo/Makefile

diff --git a/llvm/lib/Target/R600/VIInstrFormats.td b/llvm/lib/Target/AMDGPU/VIInstrFormats.td
similarity index 100%
rename from llvm/lib/Target/R600/VIInstrFormats.td
rename to llvm/lib/Target/AMDGPU/VIInstrFormats.td

diff --git a/llvm/lib/Target/R600/VIInstructions.td b/llvm/lib/Target/AMDGPU/VIInstructions.td
similarity index 100%
rename from llvm/lib/Target/R600/VIInstructions.td
rename to llvm/lib/Target/AMDGPU/VIInstructions.td

diff --git a/llvm/lib/Target/LLVMBuild.txt b/llvm/lib/Target/LLVMBuild.txt
index 3af3426..ab82324 100644 (file)
--- a/llvm/lib/Target/LLVMBuild.txt
+++ b/llvm/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/llvm/lib/Target/R600/AsmParser/CMakeLists.txt b/llvm/lib/Target/R600/AsmParser/CMakeLists.txt
deleted file mode 100644 (file)
index 1b42af7..0000000
--- a/llvm/lib/Target/R600/AsmParser/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_llvm_library(LLVMR600AsmParser
-  AMDGPUAsmParser.cpp
-  )

diff --git a/llvm/lib/Target/R600/InstPrinter/CMakeLists.txt b/llvm/lib/Target/R600/InstPrinter/CMakeLists.txt
deleted file mode 100644 (file)
index dcd8703..0000000
--- a/llvm/lib/Target/R600/InstPrinter/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_llvm_library(LLVMR600AsmPrinter
-  AMDGPUInstPrinter.cpp
-  )

diff --git a/llvm/lib/Target/R600/TargetInfo/CMakeLists.txt b/llvm/lib/Target/R600/TargetInfo/CMakeLists.txt
deleted file mode 100644 (file)
index c3bd26c..0000000
--- a/llvm/lib/Target/R600/TargetInfo/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_llvm_library(LLVMR600Info
-  AMDGPUTargetInfo.cpp
-  )

diff --git a/llvm/test/CodeGen/R600/32-bit-local-address-space.ll b/llvm/test/CodeGen/AMDGPU/32-bit-local-address-space.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/32-bit-local-address-space.ll
rename to llvm/test/CodeGen/AMDGPU/32-bit-local-address-space.ll

diff --git a/llvm/test/CodeGen/R600/README b/llvm/test/CodeGen/AMDGPU/README
similarity index 100%
rename from llvm/test/CodeGen/R600/README
rename to llvm/test/CodeGen/AMDGPU/README

diff --git a/llvm/test/CodeGen/R600/add-debug.ll b/llvm/test/CodeGen/AMDGPU/add-debug.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/add-debug.ll
rename to llvm/test/CodeGen/AMDGPU/add-debug.ll

diff --git a/llvm/test/CodeGen/R600/add.ll b/llvm/test/CodeGen/AMDGPU/add.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/add.ll
rename to llvm/test/CodeGen/AMDGPU/add.ll

diff --git a/llvm/test/CodeGen/R600/add_i64.ll b/llvm/test/CodeGen/AMDGPU/add_i64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/add_i64.ll
rename to llvm/test/CodeGen/AMDGPU/add_i64.ll

diff --git a/llvm/test/CodeGen/R600/address-space.ll b/llvm/test/CodeGen/AMDGPU/address-space.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/address-space.ll
rename to llvm/test/CodeGen/AMDGPU/address-space.ll

diff --git a/llvm/test/CodeGen/R600/and.ll b/llvm/test/CodeGen/AMDGPU/and.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/and.ll
rename to llvm/test/CodeGen/AMDGPU/and.ll

diff --git a/llvm/test/CodeGen/R600/anyext.ll b/llvm/test/CodeGen/AMDGPU/anyext.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/anyext.ll
rename to llvm/test/CodeGen/AMDGPU/anyext.ll

diff --git a/llvm/test/CodeGen/R600/array-ptr-calc-i32.ll b/llvm/test/CodeGen/AMDGPU/array-ptr-calc-i32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/array-ptr-calc-i32.ll
rename to llvm/test/CodeGen/AMDGPU/array-ptr-calc-i32.ll

diff --git a/llvm/test/CodeGen/R600/array-ptr-calc-i64.ll b/llvm/test/CodeGen/AMDGPU/array-ptr-calc-i64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/array-ptr-calc-i64.ll
rename to llvm/test/CodeGen/AMDGPU/array-ptr-calc-i64.ll

diff --git a/llvm/test/CodeGen/R600/atomic_cmp_swap_local.ll b/llvm/test/CodeGen/AMDGPU/atomic_cmp_swap_local.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/atomic_cmp_swap_local.ll
rename to llvm/test/CodeGen/AMDGPU/atomic_cmp_swap_local.ll

diff --git a/llvm/test/CodeGen/R600/atomic_load_add.ll b/llvm/test/CodeGen/AMDGPU/atomic_load_add.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/atomic_load_add.ll
rename to llvm/test/CodeGen/AMDGPU/atomic_load_add.ll

diff --git a/llvm/test/CodeGen/R600/atomic_load_sub.ll b/llvm/test/CodeGen/AMDGPU/atomic_load_sub.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/atomic_load_sub.ll
rename to llvm/test/CodeGen/AMDGPU/atomic_load_sub.ll

diff --git a/llvm/test/CodeGen/R600/basic-branch.ll b/llvm/test/CodeGen/AMDGPU/basic-branch.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/basic-branch.ll
rename to llvm/test/CodeGen/AMDGPU/basic-branch.ll

diff --git a/llvm/test/CodeGen/R600/basic-loop.ll b/llvm/test/CodeGen/AMDGPU/basic-loop.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/basic-loop.ll
rename to llvm/test/CodeGen/AMDGPU/basic-loop.ll

diff --git a/llvm/test/CodeGen/R600/bfe_uint.ll b/llvm/test/CodeGen/AMDGPU/bfe_uint.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/bfe_uint.ll
rename to llvm/test/CodeGen/AMDGPU/bfe_uint.ll

diff --git a/llvm/test/CodeGen/R600/bfi_int.ll b/llvm/test/CodeGen/AMDGPU/bfi_int.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/bfi_int.ll
rename to llvm/test/CodeGen/AMDGPU/bfi_int.ll

diff --git a/llvm/test/CodeGen/R600/big_alu.ll b/llvm/test/CodeGen/AMDGPU/big_alu.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/big_alu.ll
rename to llvm/test/CodeGen/AMDGPU/big_alu.ll

diff --git a/llvm/test/CodeGen/R600/bitcast.ll b/llvm/test/CodeGen/AMDGPU/bitcast.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/bitcast.ll
rename to llvm/test/CodeGen/AMDGPU/bitcast.ll

diff --git a/llvm/test/CodeGen/R600/bswap.ll b/llvm/test/CodeGen/AMDGPU/bswap.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/bswap.ll
rename to llvm/test/CodeGen/AMDGPU/bswap.ll

diff --git a/llvm/test/CodeGen/R600/build_vector.ll b/llvm/test/CodeGen/AMDGPU/build_vector.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/build_vector.ll
rename to llvm/test/CodeGen/AMDGPU/build_vector.ll

diff --git a/llvm/test/CodeGen/R600/call.ll b/llvm/test/CodeGen/AMDGPU/call.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/call.ll
rename to llvm/test/CodeGen/AMDGPU/call.ll

diff --git a/llvm/test/CodeGen/R600/call_fs.ll b/llvm/test/CodeGen/AMDGPU/call_fs.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/call_fs.ll
rename to llvm/test/CodeGen/AMDGPU/call_fs.ll

diff --git a/llvm/test/CodeGen/R600/cayman-loop-bug.ll b/llvm/test/CodeGen/AMDGPU/cayman-loop-bug.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cayman-loop-bug.ll
rename to llvm/test/CodeGen/AMDGPU/cayman-loop-bug.ll

diff --git a/llvm/test/CodeGen/R600/cf-stack-bug.ll b/llvm/test/CodeGen/AMDGPU/cf-stack-bug.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cf-stack-bug.ll
rename to llvm/test/CodeGen/AMDGPU/cf-stack-bug.ll

diff --git a/llvm/test/CodeGen/R600/cf_end.ll b/llvm/test/CodeGen/AMDGPU/cf_end.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cf_end.ll
rename to llvm/test/CodeGen/AMDGPU/cf_end.ll

diff --git a/llvm/test/CodeGen/R600/cgp-addressing-modes.ll b/llvm/test/CodeGen/AMDGPU/cgp-addressing-modes.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cgp-addressing-modes.ll
rename to llvm/test/CodeGen/AMDGPU/cgp-addressing-modes.ll

diff --git a/llvm/test/CodeGen/R600/coalescer_remat.ll b/llvm/test/CodeGen/AMDGPU/coalescer_remat.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/coalescer_remat.ll
rename to llvm/test/CodeGen/AMDGPU/coalescer_remat.ll

diff --git a/llvm/test/CodeGen/R600/codegen-prepare-addrmode-sext.ll b/llvm/test/CodeGen/AMDGPU/codegen-prepare-addrmode-sext.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/codegen-prepare-addrmode-sext.ll
rename to llvm/test/CodeGen/AMDGPU/codegen-prepare-addrmode-sext.ll

diff --git a/llvm/test/CodeGen/R600/combine_vloads.ll b/llvm/test/CodeGen/AMDGPU/combine_vloads.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/combine_vloads.ll
rename to llvm/test/CodeGen/AMDGPU/combine_vloads.ll

diff --git a/llvm/test/CodeGen/R600/commute-compares.ll b/llvm/test/CodeGen/AMDGPU/commute-compares.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/commute-compares.ll
rename to llvm/test/CodeGen/AMDGPU/commute-compares.ll

diff --git a/llvm/test/CodeGen/R600/commute_modifiers.ll b/llvm/test/CodeGen/AMDGPU/commute_modifiers.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/commute_modifiers.ll
rename to llvm/test/CodeGen/AMDGPU/commute_modifiers.ll

diff --git a/llvm/test/CodeGen/R600/complex-folding.ll b/llvm/test/CodeGen/AMDGPU/complex-folding.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/complex-folding.ll
rename to llvm/test/CodeGen/AMDGPU/complex-folding.ll

diff --git a/llvm/test/CodeGen/R600/concat_vectors.ll b/llvm/test/CodeGen/AMDGPU/concat_vectors.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/concat_vectors.ll
rename to llvm/test/CodeGen/AMDGPU/concat_vectors.ll

diff --git a/llvm/test/CodeGen/R600/copy-illegal-type.ll b/llvm/test/CodeGen/AMDGPU/copy-illegal-type.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/copy-illegal-type.ll
rename to llvm/test/CodeGen/AMDGPU/copy-illegal-type.ll

diff --git a/llvm/test/CodeGen/R600/copy-to-reg.ll b/llvm/test/CodeGen/AMDGPU/copy-to-reg.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/copy-to-reg.ll
rename to llvm/test/CodeGen/AMDGPU/copy-to-reg.ll

diff --git a/llvm/test/CodeGen/R600/ctlz_zero_undef.ll b/llvm/test/CodeGen/AMDGPU/ctlz_zero_undef.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ctlz_zero_undef.ll
rename to llvm/test/CodeGen/AMDGPU/ctlz_zero_undef.ll

diff --git a/llvm/test/CodeGen/R600/ctpop.ll b/llvm/test/CodeGen/AMDGPU/ctpop.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ctpop.ll
rename to llvm/test/CodeGen/AMDGPU/ctpop.ll

diff --git a/llvm/test/CodeGen/R600/ctpop64.ll b/llvm/test/CodeGen/AMDGPU/ctpop64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ctpop64.ll
rename to llvm/test/CodeGen/AMDGPU/ctpop64.ll

diff --git a/llvm/test/CodeGen/R600/cttz_zero_undef.ll b/llvm/test/CodeGen/AMDGPU/cttz_zero_undef.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cttz_zero_undef.ll
rename to llvm/test/CodeGen/AMDGPU/cttz_zero_undef.ll

diff --git a/llvm/test/CodeGen/R600/cvt_f32_ubyte.ll b/llvm/test/CodeGen/AMDGPU/cvt_f32_ubyte.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cvt_f32_ubyte.ll
rename to llvm/test/CodeGen/AMDGPU/cvt_f32_ubyte.ll

diff --git a/llvm/test/CodeGen/R600/cvt_flr_i32_f32.ll b/llvm/test/CodeGen/AMDGPU/cvt_flr_i32_f32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cvt_flr_i32_f32.ll
rename to llvm/test/CodeGen/AMDGPU/cvt_flr_i32_f32.ll

diff --git a/llvm/test/CodeGen/R600/cvt_rpi_i32_f32.ll b/llvm/test/CodeGen/AMDGPU/cvt_rpi_i32_f32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/cvt_rpi_i32_f32.ll
rename to llvm/test/CodeGen/AMDGPU/cvt_rpi_i32_f32.ll

diff --git a/llvm/test/CodeGen/R600/dagcombiner-bug-illegal-vec4-int-to-fp.ll b/llvm/test/CodeGen/AMDGPU/dagcombiner-bug-illegal-vec4-int-to-fp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/dagcombiner-bug-illegal-vec4-int-to-fp.ll
rename to llvm/test/CodeGen/AMDGPU/dagcombiner-bug-illegal-vec4-int-to-fp.ll

diff --git a/llvm/test/CodeGen/R600/debug.ll b/llvm/test/CodeGen/AMDGPU/debug.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/debug.ll
rename to llvm/test/CodeGen/AMDGPU/debug.ll

diff --git a/llvm/test/CodeGen/R600/default-fp-mode.ll b/llvm/test/CodeGen/AMDGPU/default-fp-mode.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/default-fp-mode.ll
rename to llvm/test/CodeGen/AMDGPU/default-fp-mode.ll

diff --git a/llvm/test/CodeGen/R600/disconnected-predset-break-bug.ll b/llvm/test/CodeGen/AMDGPU/disconnected-predset-break-bug.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/disconnected-predset-break-bug.ll
rename to llvm/test/CodeGen/AMDGPU/disconnected-predset-break-bug.ll

diff --git a/llvm/test/CodeGen/R600/dot4-folding.ll b/llvm/test/CodeGen/AMDGPU/dot4-folding.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/dot4-folding.ll
rename to llvm/test/CodeGen/AMDGPU/dot4-folding.ll

diff --git a/llvm/test/CodeGen/R600/ds-negative-offset-addressing-mode-loop.ll b/llvm/test/CodeGen/AMDGPU/ds-negative-offset-addressing-mode-loop.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ds-negative-offset-addressing-mode-loop.ll
rename to llvm/test/CodeGen/AMDGPU/ds-negative-offset-addressing-mode-loop.ll

diff --git a/llvm/test/CodeGen/R600/ds_read2.ll b/llvm/test/CodeGen/AMDGPU/ds_read2.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ds_read2.ll
rename to llvm/test/CodeGen/AMDGPU/ds_read2.ll

diff --git a/llvm/test/CodeGen/R600/ds_read2_offset_order.ll b/llvm/test/CodeGen/AMDGPU/ds_read2_offset_order.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ds_read2_offset_order.ll
rename to llvm/test/CodeGen/AMDGPU/ds_read2_offset_order.ll

diff --git a/llvm/test/CodeGen/R600/ds_read2st64.ll b/llvm/test/CodeGen/AMDGPU/ds_read2st64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ds_read2st64.ll
rename to llvm/test/CodeGen/AMDGPU/ds_read2st64.ll

diff --git a/llvm/test/CodeGen/R600/ds_write2.ll b/llvm/test/CodeGen/AMDGPU/ds_write2.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ds_write2.ll
rename to llvm/test/CodeGen/AMDGPU/ds_write2.ll

diff --git a/llvm/test/CodeGen/R600/ds_write2st64.ll b/llvm/test/CodeGen/AMDGPU/ds_write2st64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ds_write2st64.ll
rename to llvm/test/CodeGen/AMDGPU/ds_write2st64.ll

diff --git a/llvm/test/CodeGen/R600/elf.ll b/llvm/test/CodeGen/AMDGPU/elf.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/elf.ll
rename to llvm/test/CodeGen/AMDGPU/elf.ll

diff --git a/llvm/test/CodeGen/R600/elf.r600.ll b/llvm/test/CodeGen/AMDGPU/elf.r600.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/elf.r600.ll
rename to llvm/test/CodeGen/AMDGPU/elf.r600.ll

diff --git a/llvm/test/CodeGen/R600/empty-function.ll b/llvm/test/CodeGen/AMDGPU/empty-function.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/empty-function.ll
rename to llvm/test/CodeGen/AMDGPU/empty-function.ll

diff --git a/llvm/test/CodeGen/R600/endcf-loop-header.ll b/llvm/test/CodeGen/AMDGPU/endcf-loop-header.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/endcf-loop-header.ll
rename to llvm/test/CodeGen/AMDGPU/endcf-loop-header.ll

diff --git a/llvm/test/CodeGen/R600/extload-private.ll b/llvm/test/CodeGen/AMDGPU/extload-private.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/extload-private.ll
rename to llvm/test/CodeGen/AMDGPU/extload-private.ll

diff --git a/llvm/test/CodeGen/R600/extload.ll b/llvm/test/CodeGen/AMDGPU/extload.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/extload.ll
rename to llvm/test/CodeGen/AMDGPU/extload.ll

diff --git a/llvm/test/CodeGen/R600/extract_vector_elt_i16.ll b/llvm/test/CodeGen/AMDGPU/extract_vector_elt_i16.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/extract_vector_elt_i16.ll
rename to llvm/test/CodeGen/AMDGPU/extract_vector_elt_i16.ll

diff --git a/llvm/test/CodeGen/R600/fabs.f64.ll b/llvm/test/CodeGen/AMDGPU/fabs.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fabs.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fabs.f64.ll

diff --git a/llvm/test/CodeGen/R600/fabs.ll b/llvm/test/CodeGen/AMDGPU/fabs.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fabs.ll
rename to llvm/test/CodeGen/AMDGPU/fabs.ll

diff --git a/llvm/test/CodeGen/R600/fadd.ll b/llvm/test/CodeGen/AMDGPU/fadd.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fadd.ll
rename to llvm/test/CodeGen/AMDGPU/fadd.ll

diff --git a/llvm/test/CodeGen/R600/fadd64.ll b/llvm/test/CodeGen/AMDGPU/fadd64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fadd64.ll
rename to llvm/test/CodeGen/AMDGPU/fadd64.ll

diff --git a/llvm/test/CodeGen/R600/fceil.ll b/llvm/test/CodeGen/AMDGPU/fceil.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fceil.ll
rename to llvm/test/CodeGen/AMDGPU/fceil.ll

diff --git a/llvm/test/CodeGen/R600/fceil64.ll b/llvm/test/CodeGen/AMDGPU/fceil64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fceil64.ll
rename to llvm/test/CodeGen/AMDGPU/fceil64.ll

diff --git a/llvm/test/CodeGen/R600/fcmp-cnd.ll b/llvm/test/CodeGen/AMDGPU/fcmp-cnd.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fcmp-cnd.ll
rename to llvm/test/CodeGen/AMDGPU/fcmp-cnd.ll

diff --git a/llvm/test/CodeGen/R600/fcmp-cnde-int-args.ll b/llvm/test/CodeGen/AMDGPU/fcmp-cnde-int-args.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fcmp-cnde-int-args.ll
rename to llvm/test/CodeGen/AMDGPU/fcmp-cnde-int-args.ll

diff --git a/llvm/test/CodeGen/R600/fcmp.ll b/llvm/test/CodeGen/AMDGPU/fcmp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fcmp.ll
rename to llvm/test/CodeGen/AMDGPU/fcmp.ll

diff --git a/llvm/test/CodeGen/R600/fcmp64.ll b/llvm/test/CodeGen/AMDGPU/fcmp64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fcmp64.ll
rename to llvm/test/CodeGen/AMDGPU/fcmp64.ll

diff --git a/llvm/test/CodeGen/R600/fconst64.ll b/llvm/test/CodeGen/AMDGPU/fconst64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fconst64.ll
rename to llvm/test/CodeGen/AMDGPU/fconst64.ll

diff --git a/llvm/test/CodeGen/R600/fcopysign.f32.ll b/llvm/test/CodeGen/AMDGPU/fcopysign.f32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fcopysign.f32.ll
rename to llvm/test/CodeGen/AMDGPU/fcopysign.f32.ll

diff --git a/llvm/test/CodeGen/R600/fcopysign.f64.ll b/llvm/test/CodeGen/AMDGPU/fcopysign.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fcopysign.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fcopysign.f64.ll

diff --git a/llvm/test/CodeGen/R600/fdiv.f64.ll b/llvm/test/CodeGen/AMDGPU/fdiv.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fdiv.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fdiv.f64.ll

diff --git a/llvm/test/CodeGen/R600/fdiv.ll b/llvm/test/CodeGen/AMDGPU/fdiv.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fdiv.ll
rename to llvm/test/CodeGen/AMDGPU/fdiv.ll

diff --git a/llvm/test/CodeGen/R600/fetch-limits.r600.ll b/llvm/test/CodeGen/AMDGPU/fetch-limits.r600.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fetch-limits.r600.ll
rename to llvm/test/CodeGen/AMDGPU/fetch-limits.r600.ll

diff --git a/llvm/test/CodeGen/R600/fetch-limits.r700+.ll b/llvm/test/CodeGen/AMDGPU/fetch-limits.r700+.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fetch-limits.r700+.ll
rename to llvm/test/CodeGen/AMDGPU/fetch-limits.r700+.ll

diff --git a/llvm/test/CodeGen/R600/ffloor.f64.ll b/llvm/test/CodeGen/AMDGPU/ffloor.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ffloor.f64.ll
rename to llvm/test/CodeGen/AMDGPU/ffloor.f64.ll

diff --git a/llvm/test/CodeGen/R600/ffloor.ll b/llvm/test/CodeGen/AMDGPU/ffloor.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ffloor.ll
rename to llvm/test/CodeGen/AMDGPU/ffloor.ll

diff --git a/llvm/test/CodeGen/R600/flat-address-space.ll b/llvm/test/CodeGen/AMDGPU/flat-address-space.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/flat-address-space.ll
rename to llvm/test/CodeGen/AMDGPU/flat-address-space.ll

diff --git a/llvm/test/CodeGen/R600/floor.ll b/llvm/test/CodeGen/AMDGPU/floor.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/floor.ll
rename to llvm/test/CodeGen/AMDGPU/floor.ll

diff --git a/llvm/test/CodeGen/R600/fma-combine.ll b/llvm/test/CodeGen/AMDGPU/fma-combine.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fma-combine.ll
rename to llvm/test/CodeGen/AMDGPU/fma-combine.ll

diff --git a/llvm/test/CodeGen/R600/fma.f64.ll b/llvm/test/CodeGen/AMDGPU/fma.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fma.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fma.f64.ll

diff --git a/llvm/test/CodeGen/R600/fma.ll b/llvm/test/CodeGen/AMDGPU/fma.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fma.ll
rename to llvm/test/CodeGen/AMDGPU/fma.ll

diff --git a/llvm/test/CodeGen/R600/fmad.ll b/llvm/test/CodeGen/AMDGPU/fmad.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmad.ll
rename to llvm/test/CodeGen/AMDGPU/fmad.ll

diff --git a/llvm/test/CodeGen/R600/fmax.ll b/llvm/test/CodeGen/AMDGPU/fmax.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmax.ll
rename to llvm/test/CodeGen/AMDGPU/fmax.ll

diff --git a/llvm/test/CodeGen/R600/fmax3.f64.ll b/llvm/test/CodeGen/AMDGPU/fmax3.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmax3.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fmax3.f64.ll

diff --git a/llvm/test/CodeGen/R600/fmax3.ll b/llvm/test/CodeGen/AMDGPU/fmax3.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmax3.ll
rename to llvm/test/CodeGen/AMDGPU/fmax3.ll

diff --git a/llvm/test/CodeGen/R600/fmax_legacy.f64.ll b/llvm/test/CodeGen/AMDGPU/fmax_legacy.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmax_legacy.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fmax_legacy.f64.ll

diff --git a/llvm/test/CodeGen/R600/fmax_legacy.ll b/llvm/test/CodeGen/AMDGPU/fmax_legacy.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmax_legacy.ll
rename to llvm/test/CodeGen/AMDGPU/fmax_legacy.ll

diff --git a/llvm/test/CodeGen/R600/fmaxnum.f64.ll b/llvm/test/CodeGen/AMDGPU/fmaxnum.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmaxnum.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fmaxnum.f64.ll

diff --git a/llvm/test/CodeGen/R600/fmaxnum.ll b/llvm/test/CodeGen/AMDGPU/fmaxnum.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmaxnum.ll
rename to llvm/test/CodeGen/AMDGPU/fmaxnum.ll

diff --git a/llvm/test/CodeGen/R600/fmin.ll b/llvm/test/CodeGen/AMDGPU/fmin.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmin.ll
rename to llvm/test/CodeGen/AMDGPU/fmin.ll

diff --git a/llvm/test/CodeGen/R600/fmin3.ll b/llvm/test/CodeGen/AMDGPU/fmin3.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmin3.ll
rename to llvm/test/CodeGen/AMDGPU/fmin3.ll

diff --git a/llvm/test/CodeGen/R600/fmin_legacy.f64.ll b/llvm/test/CodeGen/AMDGPU/fmin_legacy.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmin_legacy.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fmin_legacy.f64.ll

diff --git a/llvm/test/CodeGen/R600/fmin_legacy.ll b/llvm/test/CodeGen/AMDGPU/fmin_legacy.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmin_legacy.ll
rename to llvm/test/CodeGen/AMDGPU/fmin_legacy.ll

diff --git a/llvm/test/CodeGen/R600/fminnum.f64.ll b/llvm/test/CodeGen/AMDGPU/fminnum.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fminnum.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fminnum.f64.ll

diff --git a/llvm/test/CodeGen/R600/fminnum.ll b/llvm/test/CodeGen/AMDGPU/fminnum.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fminnum.ll
rename to llvm/test/CodeGen/AMDGPU/fminnum.ll

diff --git a/llvm/test/CodeGen/R600/fmul.ll b/llvm/test/CodeGen/AMDGPU/fmul.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmul.ll
rename to llvm/test/CodeGen/AMDGPU/fmul.ll

diff --git a/llvm/test/CodeGen/R600/fmul64.ll b/llvm/test/CodeGen/AMDGPU/fmul64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmul64.ll
rename to llvm/test/CodeGen/AMDGPU/fmul64.ll

diff --git a/llvm/test/CodeGen/R600/fmuladd.ll b/llvm/test/CodeGen/AMDGPU/fmuladd.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fmuladd.ll
rename to llvm/test/CodeGen/AMDGPU/fmuladd.ll

diff --git a/llvm/test/CodeGen/R600/fnearbyint.ll b/llvm/test/CodeGen/AMDGPU/fnearbyint.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fnearbyint.ll
rename to llvm/test/CodeGen/AMDGPU/fnearbyint.ll

diff --git a/llvm/test/CodeGen/R600/fneg-fabs.f64.ll b/llvm/test/CodeGen/AMDGPU/fneg-fabs.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fneg-fabs.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fneg-fabs.f64.ll

diff --git a/llvm/test/CodeGen/R600/fneg-fabs.ll b/llvm/test/CodeGen/AMDGPU/fneg-fabs.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fneg-fabs.ll
rename to llvm/test/CodeGen/AMDGPU/fneg-fabs.ll

diff --git a/llvm/test/CodeGen/R600/fneg.f64.ll b/llvm/test/CodeGen/AMDGPU/fneg.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fneg.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fneg.f64.ll

diff --git a/llvm/test/CodeGen/R600/fneg.ll b/llvm/test/CodeGen/AMDGPU/fneg.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fneg.ll
rename to llvm/test/CodeGen/AMDGPU/fneg.ll

diff --git a/llvm/test/CodeGen/R600/fp-classify.ll b/llvm/test/CodeGen/AMDGPU/fp-classify.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fp-classify.ll
rename to llvm/test/CodeGen/AMDGPU/fp-classify.ll

diff --git a/llvm/test/CodeGen/R600/fp16_to_fp.ll b/llvm/test/CodeGen/AMDGPU/fp16_to_fp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fp16_to_fp.ll
rename to llvm/test/CodeGen/AMDGPU/fp16_to_fp.ll

diff --git a/llvm/test/CodeGen/R600/fp32_to_fp16.ll b/llvm/test/CodeGen/AMDGPU/fp32_to_fp16.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fp32_to_fp16.ll
rename to llvm/test/CodeGen/AMDGPU/fp32_to_fp16.ll

diff --git a/llvm/test/CodeGen/R600/fp_to_sint.f64.ll b/llvm/test/CodeGen/AMDGPU/fp_to_sint.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fp_to_sint.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fp_to_sint.f64.ll

diff --git a/llvm/test/CodeGen/R600/fp_to_sint.ll b/llvm/test/CodeGen/AMDGPU/fp_to_sint.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fp_to_sint.ll
rename to llvm/test/CodeGen/AMDGPU/fp_to_sint.ll

diff --git a/llvm/test/CodeGen/R600/fp_to_uint.f64.ll b/llvm/test/CodeGen/AMDGPU/fp_to_uint.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fp_to_uint.f64.ll
rename to llvm/test/CodeGen/AMDGPU/fp_to_uint.f64.ll

diff --git a/llvm/test/CodeGen/R600/fp_to_uint.ll b/llvm/test/CodeGen/AMDGPU/fp_to_uint.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fp_to_uint.ll
rename to llvm/test/CodeGen/AMDGPU/fp_to_uint.ll

diff --git a/llvm/test/CodeGen/R600/fpext.ll b/llvm/test/CodeGen/AMDGPU/fpext.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fpext.ll
rename to llvm/test/CodeGen/AMDGPU/fpext.ll

diff --git a/llvm/test/CodeGen/R600/fptrunc.ll b/llvm/test/CodeGen/AMDGPU/fptrunc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fptrunc.ll
rename to llvm/test/CodeGen/AMDGPU/fptrunc.ll

diff --git a/llvm/test/CodeGen/R600/frem.ll b/llvm/test/CodeGen/AMDGPU/frem.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/frem.ll
rename to llvm/test/CodeGen/AMDGPU/frem.ll

diff --git a/llvm/test/CodeGen/R600/fsqrt.ll b/llvm/test/CodeGen/AMDGPU/fsqrt.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fsqrt.ll
rename to llvm/test/CodeGen/AMDGPU/fsqrt.ll

diff --git a/llvm/test/CodeGen/R600/fsub.ll b/llvm/test/CodeGen/AMDGPU/fsub.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fsub.ll
rename to llvm/test/CodeGen/AMDGPU/fsub.ll

diff --git a/llvm/test/CodeGen/R600/fsub64.ll b/llvm/test/CodeGen/AMDGPU/fsub64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/fsub64.ll
rename to llvm/test/CodeGen/AMDGPU/fsub64.ll

diff --git a/llvm/test/CodeGen/R600/ftrunc.f64.ll b/llvm/test/CodeGen/AMDGPU/ftrunc.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ftrunc.f64.ll
rename to llvm/test/CodeGen/AMDGPU/ftrunc.f64.ll

diff --git a/llvm/test/CodeGen/R600/ftrunc.ll b/llvm/test/CodeGen/AMDGPU/ftrunc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ftrunc.ll
rename to llvm/test/CodeGen/AMDGPU/ftrunc.ll

diff --git a/llvm/test/CodeGen/R600/gep-address-space.ll b/llvm/test/CodeGen/AMDGPU/gep-address-space.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/gep-address-space.ll
rename to llvm/test/CodeGen/AMDGPU/gep-address-space.ll

diff --git a/llvm/test/CodeGen/R600/global-directive.ll b/llvm/test/CodeGen/AMDGPU/global-directive.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/global-directive.ll
rename to llvm/test/CodeGen/AMDGPU/global-directive.ll

diff --git a/llvm/test/CodeGen/R600/global-extload-i1.ll b/llvm/test/CodeGen/AMDGPU/global-extload-i1.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/global-extload-i1.ll
rename to llvm/test/CodeGen/AMDGPU/global-extload-i1.ll

diff --git a/llvm/test/CodeGen/R600/global-extload-i16.ll b/llvm/test/CodeGen/AMDGPU/global-extload-i16.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/global-extload-i16.ll
rename to llvm/test/CodeGen/AMDGPU/global-extload-i16.ll

diff --git a/llvm/test/CodeGen/R600/global-extload-i32.ll b/llvm/test/CodeGen/AMDGPU/global-extload-i32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/global-extload-i32.ll
rename to llvm/test/CodeGen/AMDGPU/global-extload-i32.ll

diff --git a/llvm/test/CodeGen/R600/global-extload-i8.ll b/llvm/test/CodeGen/AMDGPU/global-extload-i8.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/global-extload-i8.ll
rename to llvm/test/CodeGen/AMDGPU/global-extload-i8.ll

diff --git a/llvm/test/CodeGen/R600/global-zero-initializer.ll b/llvm/test/CodeGen/AMDGPU/global-zero-initializer.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/global-zero-initializer.ll
rename to llvm/test/CodeGen/AMDGPU/global-zero-initializer.ll

diff --git a/llvm/test/CodeGen/R600/global_atomics.ll b/llvm/test/CodeGen/AMDGPU/global_atomics.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/global_atomics.ll
rename to llvm/test/CodeGen/AMDGPU/global_atomics.ll

diff --git a/llvm/test/CodeGen/R600/gv-const-addrspace-fail.ll b/llvm/test/CodeGen/AMDGPU/gv-const-addrspace-fail.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/gv-const-addrspace-fail.ll
rename to llvm/test/CodeGen/AMDGPU/gv-const-addrspace-fail.ll

diff --git a/llvm/test/CodeGen/R600/gv-const-addrspace.ll b/llvm/test/CodeGen/AMDGPU/gv-const-addrspace.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/gv-const-addrspace.ll
rename to llvm/test/CodeGen/AMDGPU/gv-const-addrspace.ll

diff --git a/llvm/test/CodeGen/R600/half.ll b/llvm/test/CodeGen/AMDGPU/half.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/half.ll
rename to llvm/test/CodeGen/AMDGPU/half.ll

diff --git a/llvm/test/CodeGen/R600/hsa.ll b/llvm/test/CodeGen/AMDGPU/hsa.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/hsa.ll
rename to llvm/test/CodeGen/AMDGPU/hsa.ll

diff --git a/llvm/test/CodeGen/R600/i1-copy-implicit-def.ll b/llvm/test/CodeGen/AMDGPU/i1-copy-implicit-def.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/i1-copy-implicit-def.ll
rename to llvm/test/CodeGen/AMDGPU/i1-copy-implicit-def.ll

diff --git a/llvm/test/CodeGen/R600/i1-copy-phi.ll b/llvm/test/CodeGen/AMDGPU/i1-copy-phi.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/i1-copy-phi.ll
rename to llvm/test/CodeGen/AMDGPU/i1-copy-phi.ll

diff --git a/llvm/test/CodeGen/R600/i8-to-double-to-float.ll b/llvm/test/CodeGen/AMDGPU/i8-to-double-to-float.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/i8-to-double-to-float.ll
rename to llvm/test/CodeGen/AMDGPU/i8-to-double-to-float.ll

diff --git a/llvm/test/CodeGen/R600/icmp-select-sete-reverse-args.ll b/llvm/test/CodeGen/AMDGPU/icmp-select-sete-reverse-args.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/icmp-select-sete-reverse-args.ll
rename to llvm/test/CodeGen/AMDGPU/icmp-select-sete-reverse-args.ll

diff --git a/llvm/test/CodeGen/R600/icmp64.ll b/llvm/test/CodeGen/AMDGPU/icmp64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/icmp64.ll
rename to llvm/test/CodeGen/AMDGPU/icmp64.ll

diff --git a/llvm/test/CodeGen/R600/imm.ll b/llvm/test/CodeGen/AMDGPU/imm.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/imm.ll
rename to llvm/test/CodeGen/AMDGPU/imm.ll

diff --git a/llvm/test/CodeGen/R600/indirect-addressing-si.ll b/llvm/test/CodeGen/AMDGPU/indirect-addressing-si.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/indirect-addressing-si.ll
rename to llvm/test/CodeGen/AMDGPU/indirect-addressing-si.ll

diff --git a/llvm/test/CodeGen/R600/indirect-private-64.ll b/llvm/test/CodeGen/AMDGPU/indirect-private-64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/indirect-private-64.ll
rename to llvm/test/CodeGen/AMDGPU/indirect-private-64.ll

diff --git a/llvm/test/CodeGen/R600/infinite-loop-evergreen.ll b/llvm/test/CodeGen/AMDGPU/infinite-loop-evergreen.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/infinite-loop-evergreen.ll
rename to llvm/test/CodeGen/AMDGPU/infinite-loop-evergreen.ll

diff --git a/llvm/test/CodeGen/R600/infinite-loop.ll b/llvm/test/CodeGen/AMDGPU/infinite-loop.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/infinite-loop.ll
rename to llvm/test/CodeGen/AMDGPU/infinite-loop.ll

diff --git a/llvm/test/CodeGen/R600/inline-asm.ll b/llvm/test/CodeGen/AMDGPU/inline-asm.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/inline-asm.ll
rename to llvm/test/CodeGen/AMDGPU/inline-asm.ll

diff --git a/llvm/test/CodeGen/R600/inline-calls.ll b/llvm/test/CodeGen/AMDGPU/inline-calls.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/inline-calls.ll
rename to llvm/test/CodeGen/AMDGPU/inline-calls.ll

diff --git a/llvm/test/CodeGen/R600/input-mods.ll b/llvm/test/CodeGen/AMDGPU/input-mods.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/input-mods.ll
rename to llvm/test/CodeGen/AMDGPU/input-mods.ll

diff --git a/llvm/test/CodeGen/R600/insert_subreg.ll b/llvm/test/CodeGen/AMDGPU/insert_subreg.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/insert_subreg.ll
rename to llvm/test/CodeGen/AMDGPU/insert_subreg.ll

diff --git a/llvm/test/CodeGen/R600/insert_vector_elt.ll b/llvm/test/CodeGen/AMDGPU/insert_vector_elt.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/insert_vector_elt.ll
rename to llvm/test/CodeGen/AMDGPU/insert_vector_elt.ll

diff --git a/llvm/test/CodeGen/R600/jump-address.ll b/llvm/test/CodeGen/AMDGPU/jump-address.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/jump-address.ll
rename to llvm/test/CodeGen/AMDGPU/jump-address.ll

diff --git a/llvm/test/CodeGen/R600/kcache-fold.ll b/llvm/test/CodeGen/AMDGPU/kcache-fold.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/kcache-fold.ll
rename to llvm/test/CodeGen/AMDGPU/kcache-fold.ll

diff --git a/llvm/test/CodeGen/R600/kernel-args.ll b/llvm/test/CodeGen/AMDGPU/kernel-args.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/kernel-args.ll
rename to llvm/test/CodeGen/AMDGPU/kernel-args.ll

diff --git a/llvm/test/CodeGen/R600/large-alloca.ll b/llvm/test/CodeGen/AMDGPU/large-alloca.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/large-alloca.ll
rename to llvm/test/CodeGen/AMDGPU/large-alloca.ll

diff --git a/llvm/test/CodeGen/R600/large-constant-initializer.ll b/llvm/test/CodeGen/AMDGPU/large-constant-initializer.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/large-constant-initializer.ll
rename to llvm/test/CodeGen/AMDGPU/large-constant-initializer.ll

diff --git a/llvm/test/CodeGen/R600/lds-initializer.ll b/llvm/test/CodeGen/AMDGPU/lds-initializer.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/lds-initializer.ll
rename to llvm/test/CodeGen/AMDGPU/lds-initializer.ll

diff --git a/llvm/test/CodeGen/R600/lds-oqap-crash.ll b/llvm/test/CodeGen/AMDGPU/lds-oqap-crash.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/lds-oqap-crash.ll
rename to llvm/test/CodeGen/AMDGPU/lds-oqap-crash.ll

diff --git a/llvm/test/CodeGen/R600/lds-output-queue.ll b/llvm/test/CodeGen/AMDGPU/lds-output-queue.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/lds-output-queue.ll
rename to llvm/test/CodeGen/AMDGPU/lds-output-queue.ll

diff --git a/llvm/test/CodeGen/R600/lds-size.ll b/llvm/test/CodeGen/AMDGPU/lds-size.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/lds-size.ll
rename to llvm/test/CodeGen/AMDGPU/lds-size.ll

diff --git a/llvm/test/CodeGen/R600/lds-zero-initializer.ll b/llvm/test/CodeGen/AMDGPU/lds-zero-initializer.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/lds-zero-initializer.ll
rename to llvm/test/CodeGen/AMDGPU/lds-zero-initializer.ll

diff --git a/llvm/test/CodeGen/R600/legalizedag-bug-expand-setcc.ll b/llvm/test/CodeGen/AMDGPU/legalizedag-bug-expand-setcc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/legalizedag-bug-expand-setcc.ll
rename to llvm/test/CodeGen/AMDGPU/legalizedag-bug-expand-setcc.ll

diff --git a/llvm/test/CodeGen/AMDGPU/lit.local.cfg b/llvm/test/CodeGen/AMDGPU/lit.local.cfg
new file mode 100644 (file)
index 0000000..2a665f0
--- /dev/null
+++ b/llvm/test/CodeGen/AMDGPU/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'AMDGPU' in config.root.targets:
+    config.unsupported = True

diff --git a/llvm/test/CodeGen/R600/literals.ll b/llvm/test/CodeGen/AMDGPU/literals.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/literals.ll
rename to llvm/test/CodeGen/AMDGPU/literals.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.abs.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.abs.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.abs.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.abs.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.global.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.global.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.local.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.local.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.bfe.i32.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.i32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.bfe.i32.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.i32.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.bfe.u32.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.u32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.bfe.u32.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.u32.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.bfi.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfi.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.bfi.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfi.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.bfm.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfm.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.bfm.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfm.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.brev.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.brev.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.brev.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.brev.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.clamp.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.clamp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.clamp.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.clamp.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.class.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.class.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.class.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.class.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.cube.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.cube.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.cube.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.cube.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.cvt_f32_ubyte.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.cvt_f32_ubyte.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.cvt_f32_ubyte.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.cvt_f32_ubyte.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.div_fixup.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.div_fixup.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.div_fixup.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.div_fixup.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.div_fmas.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.div_fmas.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.div_fmas.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.div_fmas.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.div_scale.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.div_scale.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.div_scale.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.div_scale.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.flbit.i32.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.flbit.i32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.flbit.i32.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.flbit.i32.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.fract.f64.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.fract.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.fract.f64.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.fract.f64.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.fract.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.fract.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.fract.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.fract.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imad24.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imad24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.imad24.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imad24.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imax.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imax.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.imax.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imax.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imin.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imin.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.imin.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imin.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imul24.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imul24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.imul24.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imul24.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.kill.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.kill.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.kill.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.kill.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.ldexp.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.ldexp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.ldexp.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.ldexp.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.legacy.rsq.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.legacy.rsq.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.legacy.rsq.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.legacy.rsq.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.mul.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.mul.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.mul.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.mul.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.rcp.f64.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.rcp.f64.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.f64.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.rcp.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.rcp.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.f64.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.f64.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.f64.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.tex.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.tex.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.tex.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.tex.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.trig_preop.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.trig_preop.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.trig_preop.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.trig_preop.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.trunc.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.trunc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.trunc.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.trunc.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umad24.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umad24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.umad24.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umad24.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umax.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umax.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.umax.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umax.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umin.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umin.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.umin.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umin.ll

diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umul24.ll b/llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umul24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.AMDGPU.umul24.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umul24.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.fs.interp.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.fs.interp.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.gather4.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.gather4.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.gather4.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.gather4.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.getlod.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.getlod.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.getlod.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.getlod.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.image.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.image.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.image.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.image.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.image.sample.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.image.sample.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.image.sample.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.image.sample.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.image.sample.o.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.image.sample.o.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.image.sample.o.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.image.sample.o.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.imageload.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.imageload.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.imageload.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.imageload.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.load.dword.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.load.dword.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.load.dword.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.load.dword.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.resinfo.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.resinfo.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.resinfo.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.resinfo.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.sample-masked.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.sample-masked.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.sample-masked.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.sample-masked.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.sample.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.sample.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.sample.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.sample.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.sampled.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.sampled.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.sampled.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.sampled.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.sendmsg-m0.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.sendmsg-m0.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.sendmsg-m0.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.sendmsg-m0.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.sendmsg.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.sendmsg.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.sendmsg.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.sendmsg.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.tbuffer.store.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.tbuffer.store.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.tbuffer.store.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.tbuffer.store.ll

diff --git a/llvm/test/CodeGen/R600/llvm.SI.tid.ll b/llvm/test/CodeGen/AMDGPU/llvm.SI.tid.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.SI.tid.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.SI.tid.ll

diff --git a/llvm/test/CodeGen/R600/llvm.amdgpu.dp4.ll b/llvm/test/CodeGen/AMDGPU/llvm.amdgpu.dp4.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.amdgpu.dp4.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.amdgpu.dp4.ll

diff --git a/llvm/test/CodeGen/R600/llvm.amdgpu.kilp.ll b/llvm/test/CodeGen/AMDGPU/llvm.amdgpu.kilp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.amdgpu.kilp.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.amdgpu.kilp.ll

diff --git a/llvm/test/CodeGen/R600/llvm.amdgpu.lrp.ll b/llvm/test/CodeGen/AMDGPU/llvm.amdgpu.lrp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.amdgpu.lrp.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.amdgpu.lrp.ll

diff --git a/llvm/test/CodeGen/R600/llvm.cos.ll b/llvm/test/CodeGen/AMDGPU/llvm.cos.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.cos.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.cos.ll

diff --git a/llvm/test/CodeGen/R600/llvm.exp2.ll b/llvm/test/CodeGen/AMDGPU/llvm.exp2.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.exp2.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.exp2.ll

diff --git a/llvm/test/CodeGen/R600/llvm.log2.ll b/llvm/test/CodeGen/AMDGPU/llvm.log2.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.log2.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.log2.ll

diff --git a/llvm/test/CodeGen/R600/llvm.memcpy.ll b/llvm/test/CodeGen/AMDGPU/llvm.memcpy.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.memcpy.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.memcpy.ll

diff --git a/llvm/test/CodeGen/R600/llvm.pow.ll b/llvm/test/CodeGen/AMDGPU/llvm.pow.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.pow.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.pow.ll

diff --git a/llvm/test/CodeGen/R600/llvm.rint.f64.ll b/llvm/test/CodeGen/AMDGPU/llvm.rint.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.rint.f64.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.rint.f64.ll

diff --git a/llvm/test/CodeGen/R600/llvm.rint.ll b/llvm/test/CodeGen/AMDGPU/llvm.rint.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.rint.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.rint.ll

diff --git a/llvm/test/CodeGen/R600/llvm.round.f64.ll b/llvm/test/CodeGen/AMDGPU/llvm.round.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.round.f64.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.round.f64.ll

diff --git a/llvm/test/CodeGen/R600/llvm.round.ll b/llvm/test/CodeGen/AMDGPU/llvm.round.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.round.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.round.ll

diff --git a/llvm/test/CodeGen/R600/llvm.sin.ll b/llvm/test/CodeGen/AMDGPU/llvm.sin.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.sin.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.sin.ll

diff --git a/llvm/test/CodeGen/R600/llvm.sqrt.ll b/llvm/test/CodeGen/AMDGPU/llvm.sqrt.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/llvm.sqrt.ll
rename to llvm/test/CodeGen/AMDGPU/llvm.sqrt.ll

diff --git a/llvm/test/CodeGen/R600/load-i1.ll b/llvm/test/CodeGen/AMDGPU/load-i1.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/load-i1.ll
rename to llvm/test/CodeGen/AMDGPU/load-i1.ll

diff --git a/llvm/test/CodeGen/R600/load-input-fold.ll b/llvm/test/CodeGen/AMDGPU/load-input-fold.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/load-input-fold.ll
rename to llvm/test/CodeGen/AMDGPU/load-input-fold.ll

diff --git a/llvm/test/CodeGen/R600/load.ll b/llvm/test/CodeGen/AMDGPU/load.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/load.ll
rename to llvm/test/CodeGen/AMDGPU/load.ll

diff --git a/llvm/test/CodeGen/R600/load.vec.ll b/llvm/test/CodeGen/AMDGPU/load.vec.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/load.vec.ll
rename to llvm/test/CodeGen/AMDGPU/load.vec.ll

diff --git a/llvm/test/CodeGen/R600/load64.ll b/llvm/test/CodeGen/AMDGPU/load64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/load64.ll
rename to llvm/test/CodeGen/AMDGPU/load64.ll

diff --git a/llvm/test/CodeGen/R600/local-64.ll b/llvm/test/CodeGen/AMDGPU/local-64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/local-64.ll
rename to llvm/test/CodeGen/AMDGPU/local-64.ll

diff --git a/llvm/test/CodeGen/R600/local-atomics.ll b/llvm/test/CodeGen/AMDGPU/local-atomics.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/local-atomics.ll
rename to llvm/test/CodeGen/AMDGPU/local-atomics.ll

diff --git a/llvm/test/CodeGen/R600/local-atomics64.ll b/llvm/test/CodeGen/AMDGPU/local-atomics64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/local-atomics64.ll
rename to llvm/test/CodeGen/AMDGPU/local-atomics64.ll

diff --git a/llvm/test/CodeGen/R600/local-memory-two-objects.ll b/llvm/test/CodeGen/AMDGPU/local-memory-two-objects.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/local-memory-two-objects.ll
rename to llvm/test/CodeGen/AMDGPU/local-memory-two-objects.ll

diff --git a/llvm/test/CodeGen/R600/local-memory.ll b/llvm/test/CodeGen/AMDGPU/local-memory.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/local-memory.ll
rename to llvm/test/CodeGen/AMDGPU/local-memory.ll

diff --git a/llvm/test/CodeGen/R600/loop-address.ll b/llvm/test/CodeGen/AMDGPU/loop-address.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/loop-address.ll
rename to llvm/test/CodeGen/AMDGPU/loop-address.ll

diff --git a/llvm/test/CodeGen/R600/loop-idiom.ll b/llvm/test/CodeGen/AMDGPU/loop-idiom.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/loop-idiom.ll
rename to llvm/test/CodeGen/AMDGPU/loop-idiom.ll

diff --git a/llvm/test/CodeGen/R600/lshl.ll b/llvm/test/CodeGen/AMDGPU/lshl.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/lshl.ll
rename to llvm/test/CodeGen/AMDGPU/lshl.ll

diff --git a/llvm/test/CodeGen/R600/lshr.ll b/llvm/test/CodeGen/AMDGPU/lshr.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/lshr.ll
rename to llvm/test/CodeGen/AMDGPU/lshr.ll

diff --git a/llvm/test/CodeGen/R600/m0-spill.ll b/llvm/test/CodeGen/AMDGPU/m0-spill.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/m0-spill.ll
rename to llvm/test/CodeGen/AMDGPU/m0-spill.ll

diff --git a/llvm/test/CodeGen/R600/mad-combine.ll b/llvm/test/CodeGen/AMDGPU/mad-combine.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mad-combine.ll
rename to llvm/test/CodeGen/AMDGPU/mad-combine.ll

diff --git a/llvm/test/CodeGen/R600/mad-sub.ll b/llvm/test/CodeGen/AMDGPU/mad-sub.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mad-sub.ll
rename to llvm/test/CodeGen/AMDGPU/mad-sub.ll

diff --git a/llvm/test/CodeGen/R600/mad_int24.ll b/llvm/test/CodeGen/AMDGPU/mad_int24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mad_int24.ll
rename to llvm/test/CodeGen/AMDGPU/mad_int24.ll

diff --git a/llvm/test/CodeGen/R600/mad_uint24.ll b/llvm/test/CodeGen/AMDGPU/mad_uint24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mad_uint24.ll
rename to llvm/test/CodeGen/AMDGPU/mad_uint24.ll

diff --git a/llvm/test/CodeGen/R600/madak.ll b/llvm/test/CodeGen/AMDGPU/madak.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/madak.ll
rename to llvm/test/CodeGen/AMDGPU/madak.ll

diff --git a/llvm/test/CodeGen/R600/madmk.ll b/llvm/test/CodeGen/AMDGPU/madmk.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/madmk.ll
rename to llvm/test/CodeGen/AMDGPU/madmk.ll

diff --git a/llvm/test/CodeGen/R600/max-literals.ll b/llvm/test/CodeGen/AMDGPU/max-literals.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/max-literals.ll
rename to llvm/test/CodeGen/AMDGPU/max-literals.ll

diff --git a/llvm/test/CodeGen/R600/max.ll b/llvm/test/CodeGen/AMDGPU/max.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/max.ll
rename to llvm/test/CodeGen/AMDGPU/max.ll

diff --git a/llvm/test/CodeGen/R600/max3.ll b/llvm/test/CodeGen/AMDGPU/max3.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/max3.ll
rename to llvm/test/CodeGen/AMDGPU/max3.ll

diff --git a/llvm/test/CodeGen/R600/merge-stores.ll b/llvm/test/CodeGen/AMDGPU/merge-stores.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/merge-stores.ll
rename to llvm/test/CodeGen/AMDGPU/merge-stores.ll

diff --git a/llvm/test/CodeGen/R600/min.ll b/llvm/test/CodeGen/AMDGPU/min.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/min.ll
rename to llvm/test/CodeGen/AMDGPU/min.ll

diff --git a/llvm/test/CodeGen/R600/min3.ll b/llvm/test/CodeGen/AMDGPU/min3.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/min3.ll
rename to llvm/test/CodeGen/AMDGPU/min3.ll

diff --git a/llvm/test/CodeGen/R600/missing-store.ll b/llvm/test/CodeGen/AMDGPU/missing-store.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/missing-store.ll
rename to llvm/test/CodeGen/AMDGPU/missing-store.ll

diff --git a/llvm/test/CodeGen/R600/mubuf.ll b/llvm/test/CodeGen/AMDGPU/mubuf.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mubuf.ll
rename to llvm/test/CodeGen/AMDGPU/mubuf.ll

diff --git a/llvm/test/CodeGen/R600/mul.ll b/llvm/test/CodeGen/AMDGPU/mul.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mul.ll
rename to llvm/test/CodeGen/AMDGPU/mul.ll

diff --git a/llvm/test/CodeGen/R600/mul_int24.ll b/llvm/test/CodeGen/AMDGPU/mul_int24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mul_int24.ll
rename to llvm/test/CodeGen/AMDGPU/mul_int24.ll

diff --git a/llvm/test/CodeGen/R600/mul_uint24.ll b/llvm/test/CodeGen/AMDGPU/mul_uint24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mul_uint24.ll
rename to llvm/test/CodeGen/AMDGPU/mul_uint24.ll

diff --git a/llvm/test/CodeGen/R600/mulhu.ll b/llvm/test/CodeGen/AMDGPU/mulhu.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/mulhu.ll
rename to llvm/test/CodeGen/AMDGPU/mulhu.ll

diff --git a/llvm/test/CodeGen/R600/no-initializer-constant-addrspace.ll b/llvm/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/no-initializer-constant-addrspace.ll
rename to llvm/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll

diff --git a/llvm/test/CodeGen/R600/no-shrink-extloads.ll b/llvm/test/CodeGen/AMDGPU/no-shrink-extloads.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/no-shrink-extloads.ll
rename to llvm/test/CodeGen/AMDGPU/no-shrink-extloads.ll

diff --git a/llvm/test/CodeGen/R600/operand-folding.ll b/llvm/test/CodeGen/AMDGPU/operand-folding.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/operand-folding.ll
rename to llvm/test/CodeGen/AMDGPU/operand-folding.ll

diff --git a/llvm/test/CodeGen/R600/operand-spacing.ll b/llvm/test/CodeGen/AMDGPU/operand-spacing.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/operand-spacing.ll
rename to llvm/test/CodeGen/AMDGPU/operand-spacing.ll

diff --git a/llvm/test/CodeGen/R600/or.ll b/llvm/test/CodeGen/AMDGPU/or.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/or.ll
rename to llvm/test/CodeGen/AMDGPU/or.ll

diff --git a/llvm/test/CodeGen/R600/packetizer.ll b/llvm/test/CodeGen/AMDGPU/packetizer.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/packetizer.ll
rename to llvm/test/CodeGen/AMDGPU/packetizer.ll

diff --git a/llvm/test/CodeGen/R600/parallelandifcollapse.ll b/llvm/test/CodeGen/AMDGPU/parallelandifcollapse.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/parallelandifcollapse.ll
rename to llvm/test/CodeGen/AMDGPU/parallelandifcollapse.ll

diff --git a/llvm/test/CodeGen/R600/parallelorifcollapse.ll b/llvm/test/CodeGen/AMDGPU/parallelorifcollapse.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/parallelorifcollapse.ll
rename to llvm/test/CodeGen/AMDGPU/parallelorifcollapse.ll

diff --git a/llvm/test/CodeGen/R600/predicate-dp4.ll b/llvm/test/CodeGen/AMDGPU/predicate-dp4.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/predicate-dp4.ll
rename to llvm/test/CodeGen/AMDGPU/predicate-dp4.ll

diff --git a/llvm/test/CodeGen/R600/predicates.ll b/llvm/test/CodeGen/AMDGPU/predicates.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/predicates.ll
rename to llvm/test/CodeGen/AMDGPU/predicates.ll

diff --git a/llvm/test/CodeGen/R600/private-memory-atomics.ll b/llvm/test/CodeGen/AMDGPU/private-memory-atomics.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/private-memory-atomics.ll
rename to llvm/test/CodeGen/AMDGPU/private-memory-atomics.ll

diff --git a/llvm/test/CodeGen/R600/private-memory-broken.ll b/llvm/test/CodeGen/AMDGPU/private-memory-broken.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/private-memory-broken.ll
rename to llvm/test/CodeGen/AMDGPU/private-memory-broken.ll

diff --git a/llvm/test/CodeGen/R600/private-memory.ll b/llvm/test/CodeGen/AMDGPU/private-memory.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/private-memory.ll
rename to llvm/test/CodeGen/AMDGPU/private-memory.ll

diff --git a/llvm/test/CodeGen/R600/pv-packing.ll b/llvm/test/CodeGen/AMDGPU/pv-packing.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/pv-packing.ll
rename to llvm/test/CodeGen/AMDGPU/pv-packing.ll

diff --git a/llvm/test/CodeGen/R600/pv.ll b/llvm/test/CodeGen/AMDGPU/pv.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/pv.ll
rename to llvm/test/CodeGen/AMDGPU/pv.ll

diff --git a/llvm/test/CodeGen/R600/r600-encoding.ll b/llvm/test/CodeGen/AMDGPU/r600-encoding.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/r600-encoding.ll
rename to llvm/test/CodeGen/AMDGPU/r600-encoding.ll

diff --git a/llvm/test/CodeGen/R600/r600-export-fix.ll b/llvm/test/CodeGen/AMDGPU/r600-export-fix.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/r600-export-fix.ll
rename to llvm/test/CodeGen/AMDGPU/r600-export-fix.ll

diff --git a/llvm/test/CodeGen/R600/r600-infinite-loop-bug-while-reorganizing-vector.ll b/llvm/test/CodeGen/AMDGPU/r600-infinite-loop-bug-while-reorganizing-vector.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/r600-infinite-loop-bug-while-reorganizing-vector.ll
rename to llvm/test/CodeGen/AMDGPU/r600-infinite-loop-bug-while-reorganizing-vector.ll

diff --git a/llvm/test/CodeGen/R600/r600cfg.ll b/llvm/test/CodeGen/AMDGPU/r600cfg.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/r600cfg.ll
rename to llvm/test/CodeGen/AMDGPU/r600cfg.ll

diff --git a/llvm/test/CodeGen/R600/reciprocal.ll b/llvm/test/CodeGen/AMDGPU/reciprocal.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/reciprocal.ll
rename to llvm/test/CodeGen/AMDGPU/reciprocal.ll

diff --git a/llvm/test/CodeGen/R600/register-count-comments.ll b/llvm/test/CodeGen/AMDGPU/register-count-comments.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/register-count-comments.ll
rename to llvm/test/CodeGen/AMDGPU/register-count-comments.ll

diff --git a/llvm/test/CodeGen/R600/reorder-stores.ll b/llvm/test/CodeGen/AMDGPU/reorder-stores.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/reorder-stores.ll
rename to llvm/test/CodeGen/AMDGPU/reorder-stores.ll

diff --git a/llvm/test/CodeGen/R600/rotl.i64.ll b/llvm/test/CodeGen/AMDGPU/rotl.i64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/rotl.i64.ll
rename to llvm/test/CodeGen/AMDGPU/rotl.i64.ll

diff --git a/llvm/test/CodeGen/R600/rotl.ll b/llvm/test/CodeGen/AMDGPU/rotl.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/rotl.ll
rename to llvm/test/CodeGen/AMDGPU/rotl.ll

diff --git a/llvm/test/CodeGen/R600/rotr.i64.ll b/llvm/test/CodeGen/AMDGPU/rotr.i64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/rotr.i64.ll
rename to llvm/test/CodeGen/AMDGPU/rotr.i64.ll

diff --git a/llvm/test/CodeGen/R600/rotr.ll b/llvm/test/CodeGen/AMDGPU/rotr.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/rotr.ll
rename to llvm/test/CodeGen/AMDGPU/rotr.ll

diff --git a/llvm/test/CodeGen/R600/rsq.ll b/llvm/test/CodeGen/AMDGPU/rsq.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/rsq.ll
rename to llvm/test/CodeGen/AMDGPU/rsq.ll

diff --git a/llvm/test/CodeGen/R600/rv7x0_count3.ll b/llvm/test/CodeGen/AMDGPU/rv7x0_count3.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/rv7x0_count3.ll
rename to llvm/test/CodeGen/AMDGPU/rv7x0_count3.ll

diff --git a/llvm/test/CodeGen/R600/s_movk_i32.ll b/llvm/test/CodeGen/AMDGPU/s_movk_i32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/s_movk_i32.ll
rename to llvm/test/CodeGen/AMDGPU/s_movk_i32.ll

diff --git a/llvm/test/CodeGen/R600/saddo.ll b/llvm/test/CodeGen/AMDGPU/saddo.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/saddo.ll
rename to llvm/test/CodeGen/AMDGPU/saddo.ll

diff --git a/llvm/test/CodeGen/R600/salu-to-valu.ll b/llvm/test/CodeGen/AMDGPU/salu-to-valu.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/salu-to-valu.ll
rename to llvm/test/CodeGen/AMDGPU/salu-to-valu.ll

diff --git a/llvm/test/CodeGen/R600/scalar_to_vector.ll b/llvm/test/CodeGen/AMDGPU/scalar_to_vector.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/scalar_to_vector.ll
rename to llvm/test/CodeGen/AMDGPU/scalar_to_vector.ll

diff --git a/llvm/test/CodeGen/R600/schedule-fs-loop-nested-if.ll b/llvm/test/CodeGen/AMDGPU/schedule-fs-loop-nested-if.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-fs-loop-nested-if.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-fs-loop-nested-if.ll

diff --git a/llvm/test/CodeGen/R600/schedule-fs-loop-nested.ll b/llvm/test/CodeGen/AMDGPU/schedule-fs-loop-nested.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-fs-loop-nested.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-fs-loop-nested.ll

diff --git a/llvm/test/CodeGen/R600/schedule-fs-loop.ll b/llvm/test/CodeGen/AMDGPU/schedule-fs-loop.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-fs-loop.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-fs-loop.ll

diff --git a/llvm/test/CodeGen/R600/schedule-global-loads.ll b/llvm/test/CodeGen/AMDGPU/schedule-global-loads.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-global-loads.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-global-loads.ll

diff --git a/llvm/test/CodeGen/R600/schedule-if-2.ll b/llvm/test/CodeGen/AMDGPU/schedule-if-2.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-if-2.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-if-2.ll

diff --git a/llvm/test/CodeGen/R600/schedule-if.ll b/llvm/test/CodeGen/AMDGPU/schedule-if.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-if.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-if.ll

diff --git a/llvm/test/CodeGen/R600/schedule-kernel-arg-loads.ll b/llvm/test/CodeGen/AMDGPU/schedule-kernel-arg-loads.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-kernel-arg-loads.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-kernel-arg-loads.ll

diff --git a/llvm/test/CodeGen/R600/schedule-vs-if-nested-loop-failure.ll b/llvm/test/CodeGen/AMDGPU/schedule-vs-if-nested-loop-failure.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-vs-if-nested-loop-failure.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-vs-if-nested-loop-failure.ll

diff --git a/llvm/test/CodeGen/R600/schedule-vs-if-nested-loop.ll b/llvm/test/CodeGen/AMDGPU/schedule-vs-if-nested-loop.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/schedule-vs-if-nested-loop.ll
rename to llvm/test/CodeGen/AMDGPU/schedule-vs-if-nested-loop.ll

diff --git a/llvm/test/CodeGen/R600/scratch-buffer.ll b/llvm/test/CodeGen/AMDGPU/scratch-buffer.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/scratch-buffer.ll
rename to llvm/test/CodeGen/AMDGPU/scratch-buffer.ll

diff --git a/llvm/test/CodeGen/R600/sdiv.ll b/llvm/test/CodeGen/AMDGPU/sdiv.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sdiv.ll
rename to llvm/test/CodeGen/AMDGPU/sdiv.ll

diff --git a/llvm/test/CodeGen/R600/sdivrem24.ll b/llvm/test/CodeGen/AMDGPU/sdivrem24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sdivrem24.ll
rename to llvm/test/CodeGen/AMDGPU/sdivrem24.ll

diff --git a/llvm/test/CodeGen/R600/sdivrem64.ll b/llvm/test/CodeGen/AMDGPU/sdivrem64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sdivrem64.ll
rename to llvm/test/CodeGen/AMDGPU/sdivrem64.ll

diff --git a/llvm/test/CodeGen/R600/select-i1.ll b/llvm/test/CodeGen/AMDGPU/select-i1.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/select-i1.ll
rename to llvm/test/CodeGen/AMDGPU/select-i1.ll

diff --git a/llvm/test/CodeGen/R600/select-vectors.ll b/llvm/test/CodeGen/AMDGPU/select-vectors.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/select-vectors.ll
rename to llvm/test/CodeGen/AMDGPU/select-vectors.ll

diff --git a/llvm/test/CodeGen/R600/select.ll b/llvm/test/CodeGen/AMDGPU/select.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/select.ll
rename to llvm/test/CodeGen/AMDGPU/select.ll

diff --git a/llvm/test/CodeGen/R600/select64.ll b/llvm/test/CodeGen/AMDGPU/select64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/select64.ll
rename to llvm/test/CodeGen/AMDGPU/select64.ll

diff --git a/llvm/test/CodeGen/R600/selectcc-cnd.ll b/llvm/test/CodeGen/AMDGPU/selectcc-cnd.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/selectcc-cnd.ll
rename to llvm/test/CodeGen/AMDGPU/selectcc-cnd.ll

diff --git a/llvm/test/CodeGen/R600/selectcc-cnde-int.ll b/llvm/test/CodeGen/AMDGPU/selectcc-cnde-int.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/selectcc-cnde-int.ll
rename to llvm/test/CodeGen/AMDGPU/selectcc-cnde-int.ll

diff --git a/llvm/test/CodeGen/R600/selectcc-icmp-select-float.ll b/llvm/test/CodeGen/AMDGPU/selectcc-icmp-select-float.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/selectcc-icmp-select-float.ll
rename to llvm/test/CodeGen/AMDGPU/selectcc-icmp-select-float.ll

diff --git a/llvm/test/CodeGen/R600/selectcc-opt.ll b/llvm/test/CodeGen/AMDGPU/selectcc-opt.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/selectcc-opt.ll
rename to llvm/test/CodeGen/AMDGPU/selectcc-opt.ll

diff --git a/llvm/test/CodeGen/R600/selectcc.ll b/llvm/test/CodeGen/AMDGPU/selectcc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/selectcc.ll
rename to llvm/test/CodeGen/AMDGPU/selectcc.ll

diff --git a/llvm/test/CodeGen/R600/set-dx10.ll b/llvm/test/CodeGen/AMDGPU/set-dx10.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/set-dx10.ll
rename to llvm/test/CodeGen/AMDGPU/set-dx10.ll

diff --git a/llvm/test/CodeGen/R600/setcc-equivalent.ll b/llvm/test/CodeGen/AMDGPU/setcc-equivalent.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/setcc-equivalent.ll
rename to llvm/test/CodeGen/AMDGPU/setcc-equivalent.ll

diff --git a/llvm/test/CodeGen/R600/setcc-opt.ll b/llvm/test/CodeGen/AMDGPU/setcc-opt.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/setcc-opt.ll
rename to llvm/test/CodeGen/AMDGPU/setcc-opt.ll

diff --git a/llvm/test/CodeGen/R600/setcc.ll b/llvm/test/CodeGen/AMDGPU/setcc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/setcc.ll
rename to llvm/test/CodeGen/AMDGPU/setcc.ll

diff --git a/llvm/test/CodeGen/R600/setcc64.ll b/llvm/test/CodeGen/AMDGPU/setcc64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/setcc64.ll
rename to llvm/test/CodeGen/AMDGPU/setcc64.ll

diff --git a/llvm/test/CodeGen/R600/seto.ll b/llvm/test/CodeGen/AMDGPU/seto.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/seto.ll
rename to llvm/test/CodeGen/AMDGPU/seto.ll

diff --git a/llvm/test/CodeGen/R600/setuo.ll b/llvm/test/CodeGen/AMDGPU/setuo.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/setuo.ll
rename to llvm/test/CodeGen/AMDGPU/setuo.ll

diff --git a/llvm/test/CodeGen/R600/sext-eliminate.ll b/llvm/test/CodeGen/AMDGPU/sext-eliminate.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sext-eliminate.ll
rename to llvm/test/CodeGen/AMDGPU/sext-eliminate.ll

diff --git a/llvm/test/CodeGen/R600/sext-in-reg.ll b/llvm/test/CodeGen/AMDGPU/sext-in-reg.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sext-in-reg.ll
rename to llvm/test/CodeGen/AMDGPU/sext-in-reg.ll

diff --git a/llvm/test/CodeGen/R600/sgpr-control-flow.ll b/llvm/test/CodeGen/AMDGPU/sgpr-control-flow.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sgpr-control-flow.ll
rename to llvm/test/CodeGen/AMDGPU/sgpr-control-flow.ll

diff --git a/llvm/test/CodeGen/R600/sgpr-copy-duplicate-operand.ll b/llvm/test/CodeGen/AMDGPU/sgpr-copy-duplicate-operand.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sgpr-copy-duplicate-operand.ll
rename to llvm/test/CodeGen/AMDGPU/sgpr-copy-duplicate-operand.ll

diff --git a/llvm/test/CodeGen/R600/sgpr-copy.ll b/llvm/test/CodeGen/AMDGPU/sgpr-copy.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sgpr-copy.ll
rename to llvm/test/CodeGen/AMDGPU/sgpr-copy.ll

diff --git a/llvm/test/CodeGen/R600/shared-op-cycle.ll b/llvm/test/CodeGen/AMDGPU/shared-op-cycle.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/shared-op-cycle.ll
rename to llvm/test/CodeGen/AMDGPU/shared-op-cycle.ll

diff --git a/llvm/test/CodeGen/R600/shl.ll b/llvm/test/CodeGen/AMDGPU/shl.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/shl.ll
rename to llvm/test/CodeGen/AMDGPU/shl.ll

diff --git a/llvm/test/CodeGen/R600/shl_add_constant.ll b/llvm/test/CodeGen/AMDGPU/shl_add_constant.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/shl_add_constant.ll
rename to llvm/test/CodeGen/AMDGPU/shl_add_constant.ll

diff --git a/llvm/test/CodeGen/R600/shl_add_ptr.ll b/llvm/test/CodeGen/AMDGPU/shl_add_ptr.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/shl_add_ptr.ll
rename to llvm/test/CodeGen/AMDGPU/shl_add_ptr.ll

diff --git a/llvm/test/CodeGen/R600/si-annotate-cf-assertion.ll b/llvm/test/CodeGen/AMDGPU/si-annotate-cf-assertion.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/si-annotate-cf-assertion.ll
rename to llvm/test/CodeGen/AMDGPU/si-annotate-cf-assertion.ll

diff --git a/llvm/test/CodeGen/R600/si-annotate-cf.ll b/llvm/test/CodeGen/AMDGPU/si-annotate-cf.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/si-annotate-cf.ll
rename to llvm/test/CodeGen/AMDGPU/si-annotate-cf.ll

diff --git a/llvm/test/CodeGen/R600/si-lod-bias.ll b/llvm/test/CodeGen/AMDGPU/si-lod-bias.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/si-lod-bias.ll
rename to llvm/test/CodeGen/AMDGPU/si-lod-bias.ll

diff --git a/llvm/test/CodeGen/R600/si-sgpr-spill.ll b/llvm/test/CodeGen/AMDGPU/si-sgpr-spill.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/si-sgpr-spill.ll
rename to llvm/test/CodeGen/AMDGPU/si-sgpr-spill.ll

diff --git a/llvm/test/CodeGen/R600/si-spill-cf.ll b/llvm/test/CodeGen/AMDGPU/si-spill-cf.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/si-spill-cf.ll
rename to llvm/test/CodeGen/AMDGPU/si-spill-cf.ll

diff --git a/llvm/test/CodeGen/R600/si-triv-disjoint-mem-access.ll b/llvm/test/CodeGen/AMDGPU/si-triv-disjoint-mem-access.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/si-triv-disjoint-mem-access.ll
rename to llvm/test/CodeGen/AMDGPU/si-triv-disjoint-mem-access.ll

diff --git a/llvm/test/CodeGen/R600/si-vector-hang.ll b/llvm/test/CodeGen/AMDGPU/si-vector-hang.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/si-vector-hang.ll
rename to llvm/test/CodeGen/AMDGPU/si-vector-hang.ll

diff --git a/llvm/test/CodeGen/R600/sign_extend.ll b/llvm/test/CodeGen/AMDGPU/sign_extend.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sign_extend.ll
rename to llvm/test/CodeGen/AMDGPU/sign_extend.ll

diff --git a/llvm/test/CodeGen/R600/simplify-demanded-bits-build-pair.ll b/llvm/test/CodeGen/AMDGPU/simplify-demanded-bits-build-pair.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/simplify-demanded-bits-build-pair.ll
rename to llvm/test/CodeGen/AMDGPU/simplify-demanded-bits-build-pair.ll

diff --git a/llvm/test/CodeGen/R600/sint_to_fp.f64.ll b/llvm/test/CodeGen/AMDGPU/sint_to_fp.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sint_to_fp.f64.ll
rename to llvm/test/CodeGen/AMDGPU/sint_to_fp.f64.ll

diff --git a/llvm/test/CodeGen/R600/sint_to_fp.ll b/llvm/test/CodeGen/AMDGPU/sint_to_fp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sint_to_fp.ll
rename to llvm/test/CodeGen/AMDGPU/sint_to_fp.ll

diff --git a/llvm/test/CodeGen/R600/smrd.ll b/llvm/test/CodeGen/AMDGPU/smrd.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/smrd.ll
rename to llvm/test/CodeGen/AMDGPU/smrd.ll

diff --git a/llvm/test/CodeGen/R600/split-scalar-i64-add.ll b/llvm/test/CodeGen/AMDGPU/split-scalar-i64-add.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/split-scalar-i64-add.ll
rename to llvm/test/CodeGen/AMDGPU/split-scalar-i64-add.ll

diff --git a/llvm/test/CodeGen/R600/sra.ll b/llvm/test/CodeGen/AMDGPU/sra.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sra.ll
rename to llvm/test/CodeGen/AMDGPU/sra.ll

diff --git a/llvm/test/CodeGen/R600/srem.ll b/llvm/test/CodeGen/AMDGPU/srem.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/srem.ll
rename to llvm/test/CodeGen/AMDGPU/srem.ll

diff --git a/llvm/test/CodeGen/R600/srl.ll b/llvm/test/CodeGen/AMDGPU/srl.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/srl.ll
rename to llvm/test/CodeGen/AMDGPU/srl.ll

diff --git a/llvm/test/CodeGen/R600/ssubo.ll b/llvm/test/CodeGen/AMDGPU/ssubo.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/ssubo.ll
rename to llvm/test/CodeGen/AMDGPU/ssubo.ll

diff --git a/llvm/test/CodeGen/R600/store-barrier.ll b/llvm/test/CodeGen/AMDGPU/store-barrier.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/store-barrier.ll
rename to llvm/test/CodeGen/AMDGPU/store-barrier.ll

diff --git a/llvm/test/CodeGen/R600/store-v3i32.ll b/llvm/test/CodeGen/AMDGPU/store-v3i32.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/store-v3i32.ll
rename to llvm/test/CodeGen/AMDGPU/store-v3i32.ll

diff --git a/llvm/test/CodeGen/R600/store-v3i64.ll b/llvm/test/CodeGen/AMDGPU/store-v3i64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/store-v3i64.ll
rename to llvm/test/CodeGen/AMDGPU/store-v3i64.ll

diff --git a/llvm/test/CodeGen/R600/store-vector-ptrs.ll b/llvm/test/CodeGen/AMDGPU/store-vector-ptrs.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/store-vector-ptrs.ll
rename to llvm/test/CodeGen/AMDGPU/store-vector-ptrs.ll

diff --git a/llvm/test/CodeGen/R600/store.ll b/llvm/test/CodeGen/AMDGPU/store.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/store.ll
rename to llvm/test/CodeGen/AMDGPU/store.ll

diff --git a/llvm/test/CodeGen/R600/store.r600.ll b/llvm/test/CodeGen/AMDGPU/store.r600.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/store.r600.ll
rename to llvm/test/CodeGen/AMDGPU/store.r600.ll

diff --git a/llvm/test/CodeGen/R600/structurize.ll b/llvm/test/CodeGen/AMDGPU/structurize.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/structurize.ll
rename to llvm/test/CodeGen/AMDGPU/structurize.ll

diff --git a/llvm/test/CodeGen/R600/structurize1.ll b/llvm/test/CodeGen/AMDGPU/structurize1.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/structurize1.ll
rename to llvm/test/CodeGen/AMDGPU/structurize1.ll

diff --git a/llvm/test/CodeGen/R600/sub.ll b/llvm/test/CodeGen/AMDGPU/sub.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/sub.ll
rename to llvm/test/CodeGen/AMDGPU/sub.ll

diff --git a/llvm/test/CodeGen/R600/subreg-coalescer-crash.ll b/llvm/test/CodeGen/AMDGPU/subreg-coalescer-crash.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/subreg-coalescer-crash.ll
rename to llvm/test/CodeGen/AMDGPU/subreg-coalescer-crash.ll

diff --git a/llvm/test/CodeGen/R600/subreg-eliminate-dead.ll b/llvm/test/CodeGen/AMDGPU/subreg-eliminate-dead.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/subreg-eliminate-dead.ll
rename to llvm/test/CodeGen/AMDGPU/subreg-eliminate-dead.ll

diff --git a/llvm/test/CodeGen/R600/swizzle-export.ll b/llvm/test/CodeGen/AMDGPU/swizzle-export.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/swizzle-export.ll
rename to llvm/test/CodeGen/AMDGPU/swizzle-export.ll

diff --git a/llvm/test/CodeGen/R600/tex-clause-antidep.ll b/llvm/test/CodeGen/AMDGPU/tex-clause-antidep.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/tex-clause-antidep.ll
rename to llvm/test/CodeGen/AMDGPU/tex-clause-antidep.ll

diff --git a/llvm/test/CodeGen/R600/texture-input-merge.ll b/llvm/test/CodeGen/AMDGPU/texture-input-merge.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/texture-input-merge.ll
rename to llvm/test/CodeGen/AMDGPU/texture-input-merge.ll

diff --git a/llvm/test/CodeGen/R600/trunc-cmp-constant.ll b/llvm/test/CodeGen/AMDGPU/trunc-cmp-constant.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/trunc-cmp-constant.ll
rename to llvm/test/CodeGen/AMDGPU/trunc-cmp-constant.ll

diff --git a/llvm/test/CodeGen/R600/trunc-store-f64-to-f16.ll b/llvm/test/CodeGen/AMDGPU/trunc-store-f64-to-f16.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/trunc-store-f64-to-f16.ll
rename to llvm/test/CodeGen/AMDGPU/trunc-store-f64-to-f16.ll

diff --git a/llvm/test/CodeGen/R600/trunc-store-i1.ll b/llvm/test/CodeGen/AMDGPU/trunc-store-i1.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/trunc-store-i1.ll
rename to llvm/test/CodeGen/AMDGPU/trunc-store-i1.ll

diff --git a/llvm/test/CodeGen/R600/trunc-vector-store-assertion-failure.ll b/llvm/test/CodeGen/AMDGPU/trunc-vector-store-assertion-failure.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/trunc-vector-store-assertion-failure.ll
rename to llvm/test/CodeGen/AMDGPU/trunc-vector-store-assertion-failure.ll

diff --git a/llvm/test/CodeGen/R600/trunc.ll b/llvm/test/CodeGen/AMDGPU/trunc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/trunc.ll
rename to llvm/test/CodeGen/AMDGPU/trunc.ll

diff --git a/llvm/test/CodeGen/R600/tti-unroll-prefs.ll b/llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/tti-unroll-prefs.ll
rename to llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll

diff --git a/llvm/test/CodeGen/R600/uaddo.ll b/llvm/test/CodeGen/AMDGPU/uaddo.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/uaddo.ll
rename to llvm/test/CodeGen/AMDGPU/uaddo.ll

diff --git a/llvm/test/CodeGen/R600/udiv.ll b/llvm/test/CodeGen/AMDGPU/udiv.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/udiv.ll
rename to llvm/test/CodeGen/AMDGPU/udiv.ll

diff --git a/llvm/test/CodeGen/R600/udivrem.ll b/llvm/test/CodeGen/AMDGPU/udivrem.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/udivrem.ll
rename to llvm/test/CodeGen/AMDGPU/udivrem.ll

diff --git a/llvm/test/CodeGen/R600/udivrem24.ll b/llvm/test/CodeGen/AMDGPU/udivrem24.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/udivrem24.ll
rename to llvm/test/CodeGen/AMDGPU/udivrem24.ll

diff --git a/llvm/test/CodeGen/R600/udivrem64.ll b/llvm/test/CodeGen/AMDGPU/udivrem64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/udivrem64.ll
rename to llvm/test/CodeGen/AMDGPU/udivrem64.ll

diff --git a/llvm/test/CodeGen/R600/uint_to_fp.f64.ll b/llvm/test/CodeGen/AMDGPU/uint_to_fp.f64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/uint_to_fp.f64.ll
rename to llvm/test/CodeGen/AMDGPU/uint_to_fp.f64.ll

diff --git a/llvm/test/CodeGen/R600/uint_to_fp.ll b/llvm/test/CodeGen/AMDGPU/uint_to_fp.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/uint_to_fp.ll
rename to llvm/test/CodeGen/AMDGPU/uint_to_fp.ll

diff --git a/llvm/test/CodeGen/R600/unaligned-load-store.ll b/llvm/test/CodeGen/AMDGPU/unaligned-load-store.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/unaligned-load-store.ll
rename to llvm/test/CodeGen/AMDGPU/unaligned-load-store.ll

diff --git a/llvm/test/CodeGen/R600/unhandled-loop-condition-assertion.ll b/llvm/test/CodeGen/AMDGPU/unhandled-loop-condition-assertion.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/unhandled-loop-condition-assertion.ll
rename to llvm/test/CodeGen/AMDGPU/unhandled-loop-condition-assertion.ll

diff --git a/llvm/test/CodeGen/R600/unroll.ll b/llvm/test/CodeGen/AMDGPU/unroll.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/unroll.ll
rename to llvm/test/CodeGen/AMDGPU/unroll.ll

diff --git a/llvm/test/CodeGen/R600/unsupported-cc.ll b/llvm/test/CodeGen/AMDGPU/unsupported-cc.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/unsupported-cc.ll
rename to llvm/test/CodeGen/AMDGPU/unsupported-cc.ll

diff --git a/llvm/test/CodeGen/R600/urecip.ll b/llvm/test/CodeGen/AMDGPU/urecip.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/urecip.ll
rename to llvm/test/CodeGen/AMDGPU/urecip.ll

diff --git a/llvm/test/CodeGen/R600/urem.ll b/llvm/test/CodeGen/AMDGPU/urem.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/urem.ll
rename to llvm/test/CodeGen/AMDGPU/urem.ll

diff --git a/llvm/test/CodeGen/R600/use-sgpr-multiple-times.ll b/llvm/test/CodeGen/AMDGPU/use-sgpr-multiple-times.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/use-sgpr-multiple-times.ll
rename to llvm/test/CodeGen/AMDGPU/use-sgpr-multiple-times.ll

diff --git a/llvm/test/CodeGen/R600/usubo.ll b/llvm/test/CodeGen/AMDGPU/usubo.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/usubo.ll
rename to llvm/test/CodeGen/AMDGPU/usubo.ll

diff --git a/llvm/test/CodeGen/R600/v1i64-kernel-arg.ll b/llvm/test/CodeGen/AMDGPU/v1i64-kernel-arg.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/v1i64-kernel-arg.ll
rename to llvm/test/CodeGen/AMDGPU/v1i64-kernel-arg.ll

diff --git a/llvm/test/CodeGen/R600/v_cndmask.ll b/llvm/test/CodeGen/AMDGPU/v_cndmask.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/v_cndmask.ll
rename to llvm/test/CodeGen/AMDGPU/v_cndmask.ll

diff --git a/llvm/test/CodeGen/R600/valu-i1.ll b/llvm/test/CodeGen/AMDGPU/valu-i1.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/valu-i1.ll
rename to llvm/test/CodeGen/AMDGPU/valu-i1.ll

diff --git a/llvm/test/CodeGen/R600/vector-alloca.ll b/llvm/test/CodeGen/AMDGPU/vector-alloca.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/vector-alloca.ll
rename to llvm/test/CodeGen/AMDGPU/vector-alloca.ll

diff --git a/llvm/test/CodeGen/R600/vertex-fetch-encoding.ll b/llvm/test/CodeGen/AMDGPU/vertex-fetch-encoding.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/vertex-fetch-encoding.ll
rename to llvm/test/CodeGen/AMDGPU/vertex-fetch-encoding.ll

diff --git a/llvm/test/CodeGen/R600/vop-shrink.ll b/llvm/test/CodeGen/AMDGPU/vop-shrink.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/vop-shrink.ll
rename to llvm/test/CodeGen/AMDGPU/vop-shrink.ll

diff --git a/llvm/test/CodeGen/R600/vselect.ll b/llvm/test/CodeGen/AMDGPU/vselect.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/vselect.ll
rename to llvm/test/CodeGen/AMDGPU/vselect.ll

diff --git a/llvm/test/CodeGen/R600/vselect64.ll b/llvm/test/CodeGen/AMDGPU/vselect64.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/vselect64.ll
rename to llvm/test/CodeGen/AMDGPU/vselect64.ll

diff --git a/llvm/test/CodeGen/R600/vtx-fetch-branch.ll b/llvm/test/CodeGen/AMDGPU/vtx-fetch-branch.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/vtx-fetch-branch.ll
rename to llvm/test/CodeGen/AMDGPU/vtx-fetch-branch.ll

diff --git a/llvm/test/CodeGen/R600/vtx-schedule.ll b/llvm/test/CodeGen/AMDGPU/vtx-schedule.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/vtx-schedule.ll
rename to llvm/test/CodeGen/AMDGPU/vtx-schedule.ll

diff --git a/llvm/test/CodeGen/R600/wait.ll b/llvm/test/CodeGen/AMDGPU/wait.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/wait.ll
rename to llvm/test/CodeGen/AMDGPU/wait.ll

diff --git a/llvm/test/CodeGen/R600/work-item-intrinsics.ll b/llvm/test/CodeGen/AMDGPU/work-item-intrinsics.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/work-item-intrinsics.ll
rename to llvm/test/CodeGen/AMDGPU/work-item-intrinsics.ll

diff --git a/llvm/test/CodeGen/R600/wrong-transalu-pos-fix.ll b/llvm/test/CodeGen/AMDGPU/wrong-transalu-pos-fix.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/wrong-transalu-pos-fix.ll
rename to llvm/test/CodeGen/AMDGPU/wrong-transalu-pos-fix.ll

diff --git a/llvm/test/CodeGen/R600/xor.ll b/llvm/test/CodeGen/AMDGPU/xor.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/xor.ll
rename to llvm/test/CodeGen/AMDGPU/xor.ll

diff --git a/llvm/test/CodeGen/R600/zero_extend.ll b/llvm/test/CodeGen/AMDGPU/zero_extend.ll
similarity index 100%
rename from llvm/test/CodeGen/R600/zero_extend.ll
rename to llvm/test/CodeGen/AMDGPU/zero_extend.ll

diff --git a/llvm/test/CodeGen/R600/lit.local.cfg b/llvm/test/CodeGen/R600/lit.local.cfg
deleted file mode 100644 (file)
index ad9ce25..0000000
--- a/llvm/test/CodeGen/R600/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if not 'R600' in config.root.targets:
-    config.unsupported = True

diff --git a/llvm/test/MC/R600/ds-err.s b/llvm/test/MC/AMDGPU/ds-err.s
similarity index 100%
rename from llvm/test/MC/R600/ds-err.s
rename to llvm/test/MC/AMDGPU/ds-err.s

diff --git a/llvm/test/MC/R600/ds.s b/llvm/test/MC/AMDGPU/ds.s
similarity index 100%
rename from llvm/test/MC/R600/ds.s
rename to llvm/test/MC/AMDGPU/ds.s

diff --git a/llvm/test/MC/R600/flat.s b/llvm/test/MC/AMDGPU/flat.s
similarity index 100%
rename from llvm/test/MC/R600/flat.s
rename to llvm/test/MC/AMDGPU/flat.s

diff --git a/llvm/test/MC/AMDGPU/lit.local.cfg b/llvm/test/MC/AMDGPU/lit.local.cfg
new file mode 100644 (file)
index 0000000..2a665f0
--- /dev/null
+++ b/llvm/test/MC/AMDGPU/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'AMDGPU' in config.root.targets:
+    config.unsupported = True

diff --git a/llvm/test/MC/R600/mubuf.s b/llvm/test/MC/AMDGPU/mubuf.s
similarity index 100%
rename from llvm/test/MC/R600/mubuf.s
rename to llvm/test/MC/AMDGPU/mubuf.s

diff --git a/llvm/test/MC/R600/smrd.s b/llvm/test/MC/AMDGPU/smrd.s
similarity index 100%
rename from llvm/test/MC/R600/smrd.s
rename to llvm/test/MC/AMDGPU/smrd.s

diff --git a/llvm/test/MC/R600/sop1-err.s b/llvm/test/MC/AMDGPU/sop1-err.s
similarity index 100%
rename from llvm/test/MC/R600/sop1-err.s
rename to llvm/test/MC/AMDGPU/sop1-err.s

diff --git a/llvm/test/MC/R600/sop1.s b/llvm/test/MC/AMDGPU/sop1.s
similarity index 100%
rename from llvm/test/MC/R600/sop1.s
rename to llvm/test/MC/AMDGPU/sop1.s

diff --git a/llvm/test/MC/R600/sop2.s b/llvm/test/MC/AMDGPU/sop2.s
similarity index 100%
rename from llvm/test/MC/R600/sop2.s
rename to llvm/test/MC/AMDGPU/sop2.s

diff --git a/llvm/test/MC/R600/sopc.s b/llvm/test/MC/AMDGPU/sopc.s
similarity index 100%
rename from llvm/test/MC/R600/sopc.s
rename to llvm/test/MC/AMDGPU/sopc.s

diff --git a/llvm/test/MC/R600/sopk.s b/llvm/test/MC/AMDGPU/sopk.s
similarity index 100%
rename from llvm/test/MC/R600/sopk.s
rename to llvm/test/MC/AMDGPU/sopk.s

diff --git a/llvm/test/MC/R600/sopp.s b/llvm/test/MC/AMDGPU/sopp.s
similarity index 100%
rename from llvm/test/MC/R600/sopp.s
rename to llvm/test/MC/AMDGPU/sopp.s

diff --git a/llvm/test/MC/R600/vop1.s b/llvm/test/MC/AMDGPU/vop1.s
similarity index 100%
rename from llvm/test/MC/R600/vop1.s
rename to llvm/test/MC/AMDGPU/vop1.s

diff --git a/llvm/test/MC/R600/vop2-err.s b/llvm/test/MC/AMDGPU/vop2-err.s
similarity index 100%
rename from llvm/test/MC/R600/vop2-err.s
rename to llvm/test/MC/AMDGPU/vop2-err.s

diff --git a/llvm/test/MC/R600/vop2.s b/llvm/test/MC/AMDGPU/vop2.s
similarity index 100%
rename from llvm/test/MC/R600/vop2.s
rename to llvm/test/MC/AMDGPU/vop2.s

diff --git a/llvm/test/MC/R600/vop3-errs.s b/llvm/test/MC/AMDGPU/vop3-errs.s
similarity index 100%
rename from llvm/test/MC/R600/vop3-errs.s
rename to llvm/test/MC/AMDGPU/vop3-errs.s

diff --git a/llvm/test/MC/R600/vop3.s b/llvm/test/MC/AMDGPU/vop3.s
similarity index 100%
rename from llvm/test/MC/R600/vop3.s
rename to llvm/test/MC/AMDGPU/vop3.s

diff --git a/llvm/test/MC/R600/vopc.s b/llvm/test/MC/AMDGPU/vopc.s
similarity index 100%
rename from llvm/test/MC/R600/vopc.s
rename to llvm/test/MC/AMDGPU/vopc.s

diff --git a/llvm/test/MC/R600/lit.local.cfg b/llvm/test/MC/R600/lit.local.cfg
deleted file mode 100644 (file)
index ad9ce25..0000000
--- a/llvm/test/MC/R600/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if not 'R600' in config.root.targets:
-    config.unsupported = True