From 953c6814730951ad9a286d7991e9c8c481433d45 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 13 Jun 2015 03:28:10 +0000 Subject: [PATCH] R600 -> AMDGPU rename git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239657 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 2 +- autoconf/configure.ac | 5 +++-- configure | 5 +++-- docs/{R600Usage.rst => AMDGPUUsage.rst} | 10 +++++----- docs/CompilerWriterInfo.rst | 4 ++-- docs/GettingStarted.rst | 2 +- docs/index.rst | 6 +++--- lib/Target/{R600 => AMDGPU}/AMDGPU.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPU.td | 0 lib/Target/{R600 => AMDGPU}/AMDGPUAlwaysInlinePass.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUAsmPrinter.cpp | 2 +- lib/Target/{R600 => AMDGPU}/AMDGPUAsmPrinter.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUCallingConv.td | 0 lib/Target/{R600 => AMDGPU}/AMDGPUFrameLowering.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUFrameLowering.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUISelDAGToDAG.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUISelLowering.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUISelLowering.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUInstrInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUInstrInfo.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUInstrInfo.td | 0 lib/Target/{R600 => AMDGPU}/AMDGPUInstructions.td | 0 lib/Target/{R600 => AMDGPU}/AMDGPUIntrinsicInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUIntrinsicInfo.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUIntrinsics.td | 0 lib/Target/{R600 => AMDGPU}/AMDGPUMCInstLower.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUMCInstLower.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUMachineFunction.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUMachineFunction.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUPromoteAlloca.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPURegisterInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPURegisterInfo.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPURegisterInfo.td | 0 lib/Target/{R600 => AMDGPU}/AMDGPUSubtarget.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDGPUSubtarget.h | 0 lib/Target/{R600 => AMDGPU}/AMDGPUTargetMachine.cpp | 2 +- lib/Target/{R600 => AMDGPU}/AMDGPUTargetMachine.h | 0 .../{R600 => AMDGPU}/AMDGPUTargetTransformInfo.cpp | 0 .../{R600 => AMDGPU}/AMDGPUTargetTransformInfo.h | 0 lib/Target/{R600 => AMDGPU}/AMDILCFGStructurizer.cpp | 0 lib/Target/{R600 => AMDGPU}/AMDKernelCodeT.h | 0 .../{R600 => AMDGPU}/AsmParser/AMDGPUAsmParser.cpp | 2 +- lib/Target/AMDGPU/AsmParser/CMakeLists.txt | 3 +++ .../MCTargetDesc => AMDGPU/AsmParser}/LLVMBuild.txt | 10 +++++----- lib/Target/{R600 => AMDGPU}/AsmParser/Makefile | 0 lib/Target/{R600 => AMDGPU}/CIInstructions.td | 0 lib/Target/{R600 => AMDGPU}/CMakeLists.txt | 2 +- lib/Target/{R600 => AMDGPU}/CaymanInstructions.td | 0 lib/Target/{R600 => AMDGPU}/EvergreenInstructions.td | 0 .../{R600 => AMDGPU}/InstPrinter/AMDGPUInstPrinter.cpp | 0 .../{R600 => AMDGPU}/InstPrinter/AMDGPUInstPrinter.h | 0 lib/Target/AMDGPU/InstPrinter/CMakeLists.txt | 3 +++ lib/Target/{R600 => AMDGPU}/InstPrinter/LLVMBuild.txt | 8 ++++---- lib/Target/{R600 => AMDGPU}/InstPrinter/Makefile | 0 lib/Target/{R600 => AMDGPU}/LLVMBuild.txt | 10 +++++----- .../{R600 => AMDGPU}/MCTargetDesc/AMDGPUAsmBackend.cpp | 0 .../MCTargetDesc/AMDGPUELFObjectWriter.cpp | 0 .../{R600 => AMDGPU}/MCTargetDesc/AMDGPUFixupKinds.h | 0 .../{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCAsmInfo.cpp | 0 .../{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCAsmInfo.h | 0 .../MCTargetDesc/AMDGPUMCCodeEmitter.cpp | 0 .../MCTargetDesc/AMDGPUMCCodeEmitter.h | 0 .../MCTargetDesc/AMDGPUMCTargetDesc.cpp | 2 +- .../{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCTargetDesc.h | 0 .../{R600 => AMDGPU}/MCTargetDesc/CMakeLists.txt | 2 +- .../AsmParser => AMDGPU/MCTargetDesc}/LLVMBuild.txt | 10 +++++----- lib/Target/{R600 => AMDGPU}/MCTargetDesc/Makefile | 0 .../MCTargetDesc/R600MCCodeEmitter.cpp | 0 .../{R600 => AMDGPU}/MCTargetDesc/SIMCCodeEmitter.cpp | 0 lib/Target/{R600 => AMDGPU}/Makefile | 0 lib/Target/{R600 => AMDGPU}/Processors.td | 0 lib/Target/{R600 => AMDGPU}/R600ClauseMergePass.cpp | 0 .../{R600 => AMDGPU}/R600ControlFlowFinalizer.cpp | 0 lib/Target/{R600 => AMDGPU}/R600Defines.h | 0 lib/Target/{R600 => AMDGPU}/R600EmitClauseMarkers.cpp | 0 .../{R600 => AMDGPU}/R600ExpandSpecialInstrs.cpp | 0 lib/Target/{R600 => AMDGPU}/R600ISelLowering.cpp | 0 lib/Target/{R600 => AMDGPU}/R600ISelLowering.h | 0 lib/Target/{R600 => AMDGPU}/R600InstrFormats.td | 0 lib/Target/{R600 => AMDGPU}/R600InstrInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/R600InstrInfo.h | 0 lib/Target/{R600 => AMDGPU}/R600Instructions.td | 0 lib/Target/{R600 => AMDGPU}/R600Intrinsics.td | 0 .../{R600 => AMDGPU}/R600MachineFunctionInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/R600MachineFunctionInfo.h | 0 lib/Target/{R600 => AMDGPU}/R600MachineScheduler.cpp | 0 lib/Target/{R600 => AMDGPU}/R600MachineScheduler.h | 0 .../{R600 => AMDGPU}/R600OptimizeVectorRegisters.cpp | 0 lib/Target/{R600 => AMDGPU}/R600Packetizer.cpp | 0 lib/Target/{R600 => AMDGPU}/R600RegisterInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/R600RegisterInfo.h | 0 lib/Target/{R600 => AMDGPU}/R600RegisterInfo.td | 0 lib/Target/{R600 => AMDGPU}/R600Schedule.td | 0 .../{R600 => AMDGPU}/R600TextureIntrinsicsReplacer.cpp | 0 lib/Target/{R600 => AMDGPU}/R700Instructions.td | 0 lib/Target/{R600 => AMDGPU}/SIAnnotateControlFlow.cpp | 0 lib/Target/{R600 => AMDGPU}/SIDefines.h | 0 .../{R600 => AMDGPU}/SIFixControlFlowLiveIntervals.cpp | 0 lib/Target/{R600 => AMDGPU}/SIFixSGPRCopies.cpp | 0 lib/Target/{R600 => AMDGPU}/SIFixSGPRLiveRanges.cpp | 0 lib/Target/{R600 => AMDGPU}/SIFoldOperands.cpp | 0 lib/Target/{R600 => AMDGPU}/SIISelLowering.cpp | 0 lib/Target/{R600 => AMDGPU}/SIISelLowering.h | 0 lib/Target/{R600 => AMDGPU}/SIInsertWaits.cpp | 0 lib/Target/{R600 => AMDGPU}/SIInstrFormats.td | 0 lib/Target/{R600 => AMDGPU}/SIInstrInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/SIInstrInfo.h | 0 lib/Target/{R600 => AMDGPU}/SIInstrInfo.td | 0 lib/Target/{R600 => AMDGPU}/SIInstructions.td | 0 lib/Target/{R600 => AMDGPU}/SIIntrinsics.td | 0 lib/Target/{R600 => AMDGPU}/SILoadStoreOptimizer.cpp | 0 lib/Target/{R600 => AMDGPU}/SILowerControlFlow.cpp | 0 lib/Target/{R600 => AMDGPU}/SILowerI1Copies.cpp | 0 lib/Target/{R600 => AMDGPU}/SIMachineFunctionInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/SIMachineFunctionInfo.h | 0 lib/Target/{R600 => AMDGPU}/SIPrepareScratchRegs.cpp | 0 lib/Target/{R600 => AMDGPU}/SIRegisterInfo.cpp | 0 lib/Target/{R600 => AMDGPU}/SIRegisterInfo.h | 0 lib/Target/{R600 => AMDGPU}/SIRegisterInfo.td | 0 lib/Target/{R600 => AMDGPU}/SISchedule.td | 0 lib/Target/{R600 => AMDGPU}/SIShrinkInstructions.cpp | 0 lib/Target/{R600 => AMDGPU}/SITypeRewriter.cpp | 0 .../{R600 => AMDGPU}/TargetInfo/AMDGPUTargetInfo.cpp | 2 +- lib/Target/AMDGPU/TargetInfo/CMakeLists.txt | 3 +++ lib/Target/{R600 => AMDGPU}/TargetInfo/LLVMBuild.txt | 8 ++++---- lib/Target/{R600 => AMDGPU}/TargetInfo/Makefile | 0 lib/Target/{R600 => AMDGPU}/VIInstrFormats.td | 0 lib/Target/{R600 => AMDGPU}/VIInstructions.td | 0 lib/Target/LLVMBuild.txt | 2 +- lib/Target/R600/AsmParser/CMakeLists.txt | 3 --- lib/Target/R600/InstPrinter/CMakeLists.txt | 3 --- lib/Target/R600/TargetInfo/CMakeLists.txt | 3 --- .../{R600 => AMDGPU}/32-bit-local-address-space.ll | 0 test/CodeGen/{R600 => AMDGPU}/README | 0 test/CodeGen/{R600 => AMDGPU}/add-debug.ll | 0 test/CodeGen/{R600 => AMDGPU}/add.ll | 0 test/CodeGen/{R600 => AMDGPU}/add_i64.ll | 0 test/CodeGen/{R600 => AMDGPU}/address-space.ll | 0 test/CodeGen/{R600 => AMDGPU}/and.ll | 0 test/CodeGen/{R600 => AMDGPU}/anyext.ll | 0 test/CodeGen/{R600 => AMDGPU}/array-ptr-calc-i32.ll | 0 test/CodeGen/{R600 => AMDGPU}/array-ptr-calc-i64.ll | 0 test/CodeGen/{R600 => AMDGPU}/atomic_cmp_swap_local.ll | 0 test/CodeGen/{R600 => AMDGPU}/atomic_load_add.ll | 0 test/CodeGen/{R600 => AMDGPU}/atomic_load_sub.ll | 0 test/CodeGen/{R600 => AMDGPU}/basic-branch.ll | 0 test/CodeGen/{R600 => AMDGPU}/basic-loop.ll | 0 test/CodeGen/{R600 => AMDGPU}/bfe_uint.ll | 0 test/CodeGen/{R600 => AMDGPU}/bfi_int.ll | 0 test/CodeGen/{R600 => AMDGPU}/big_alu.ll | 0 test/CodeGen/{R600 => AMDGPU}/bitcast.ll | 0 test/CodeGen/{R600 => AMDGPU}/bswap.ll | 0 test/CodeGen/{R600 => AMDGPU}/build_vector.ll | 0 test/CodeGen/{R600 => AMDGPU}/call.ll | 0 test/CodeGen/{R600 => AMDGPU}/call_fs.ll | 0 test/CodeGen/{R600 => AMDGPU}/cayman-loop-bug.ll | 0 test/CodeGen/{R600 => AMDGPU}/cf-stack-bug.ll | 0 test/CodeGen/{R600 => AMDGPU}/cf_end.ll | 0 test/CodeGen/{R600 => AMDGPU}/cgp-addressing-modes.ll | 0 test/CodeGen/{R600 => AMDGPU}/coalescer_remat.ll | 0 .../{R600 => AMDGPU}/codegen-prepare-addrmode-sext.ll | 0 test/CodeGen/{R600 => AMDGPU}/combine_vloads.ll | 0 test/CodeGen/{R600 => AMDGPU}/commute-compares.ll | 0 test/CodeGen/{R600 => AMDGPU}/commute_modifiers.ll | 0 test/CodeGen/{R600 => AMDGPU}/complex-folding.ll | 0 test/CodeGen/{R600 => AMDGPU}/concat_vectors.ll | 0 test/CodeGen/{R600 => AMDGPU}/copy-illegal-type.ll | 0 test/CodeGen/{R600 => AMDGPU}/copy-to-reg.ll | 0 test/CodeGen/{R600 => AMDGPU}/ctlz_zero_undef.ll | 0 test/CodeGen/{R600 => AMDGPU}/ctpop.ll | 0 test/CodeGen/{R600 => AMDGPU}/ctpop64.ll | 0 test/CodeGen/{R600 => AMDGPU}/cttz_zero_undef.ll | 0 test/CodeGen/{R600 => AMDGPU}/cvt_f32_ubyte.ll | 0 test/CodeGen/{R600 => AMDGPU}/cvt_flr_i32_f32.ll | 0 test/CodeGen/{R600 => AMDGPU}/cvt_rpi_i32_f32.ll | 0 .../dagcombiner-bug-illegal-vec4-int-to-fp.ll | 0 test/CodeGen/{R600 => AMDGPU}/debug.ll | 0 test/CodeGen/{R600 => AMDGPU}/default-fp-mode.ll | 0 .../{R600 => AMDGPU}/disconnected-predset-break-bug.ll | 0 test/CodeGen/{R600 => AMDGPU}/dot4-folding.ll | 0 .../ds-negative-offset-addressing-mode-loop.ll | 0 test/CodeGen/{R600 => AMDGPU}/ds_read2.ll | 0 test/CodeGen/{R600 => AMDGPU}/ds_read2_offset_order.ll | 0 test/CodeGen/{R600 => AMDGPU}/ds_read2st64.ll | 0 test/CodeGen/{R600 => AMDGPU}/ds_write2.ll | 0 test/CodeGen/{R600 => AMDGPU}/ds_write2st64.ll | 0 test/CodeGen/{R600 => AMDGPU}/elf.ll | 0 test/CodeGen/{R600 => AMDGPU}/elf.r600.ll | 0 test/CodeGen/{R600 => AMDGPU}/empty-function.ll | 0 test/CodeGen/{R600 => AMDGPU}/endcf-loop-header.ll | 0 test/CodeGen/{R600 => AMDGPU}/extload-private.ll | 0 test/CodeGen/{R600 => AMDGPU}/extload.ll | 0 .../CodeGen/{R600 => AMDGPU}/extract_vector_elt_i16.ll | 0 test/CodeGen/{R600 => AMDGPU}/fabs.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fabs.ll | 0 test/CodeGen/{R600 => AMDGPU}/fadd.ll | 0 test/CodeGen/{R600 => AMDGPU}/fadd64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fceil.ll | 0 test/CodeGen/{R600 => AMDGPU}/fceil64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fcmp-cnd.ll | 0 test/CodeGen/{R600 => AMDGPU}/fcmp-cnde-int-args.ll | 0 test/CodeGen/{R600 => AMDGPU}/fcmp.ll | 0 test/CodeGen/{R600 => AMDGPU}/fcmp64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fconst64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fcopysign.f32.ll | 0 test/CodeGen/{R600 => AMDGPU}/fcopysign.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fdiv.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fdiv.ll | 0 test/CodeGen/{R600 => AMDGPU}/fetch-limits.r600.ll | 0 test/CodeGen/{R600 => AMDGPU}/fetch-limits.r700+.ll | 0 test/CodeGen/{R600 => AMDGPU}/ffloor.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/ffloor.ll | 0 test/CodeGen/{R600 => AMDGPU}/flat-address-space.ll | 0 test/CodeGen/{R600 => AMDGPU}/floor.ll | 0 test/CodeGen/{R600 => AMDGPU}/fma-combine.ll | 0 test/CodeGen/{R600 => AMDGPU}/fma.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fma.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmad.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmax.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmax3.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmax3.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmax_legacy.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmax_legacy.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmaxnum.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmaxnum.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmin.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmin3.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmin_legacy.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmin_legacy.ll | 0 test/CodeGen/{R600 => AMDGPU}/fminnum.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fminnum.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmul.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmul64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fmuladd.ll | 0 test/CodeGen/{R600 => AMDGPU}/fnearbyint.ll | 0 test/CodeGen/{R600 => AMDGPU}/fneg-fabs.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fneg-fabs.ll | 0 test/CodeGen/{R600 => AMDGPU}/fneg.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fneg.ll | 0 test/CodeGen/{R600 => AMDGPU}/fp-classify.ll | 0 test/CodeGen/{R600 => AMDGPU}/fp16_to_fp.ll | 0 test/CodeGen/{R600 => AMDGPU}/fp32_to_fp16.ll | 0 test/CodeGen/{R600 => AMDGPU}/fp_to_sint.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fp_to_sint.ll | 0 test/CodeGen/{R600 => AMDGPU}/fp_to_uint.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/fp_to_uint.ll | 0 test/CodeGen/{R600 => AMDGPU}/fpext.ll | 0 test/CodeGen/{R600 => AMDGPU}/fptrunc.ll | 0 test/CodeGen/{R600 => AMDGPU}/frem.ll | 0 test/CodeGen/{R600 => AMDGPU}/fsqrt.ll | 0 test/CodeGen/{R600 => AMDGPU}/fsub.ll | 0 test/CodeGen/{R600 => AMDGPU}/fsub64.ll | 0 test/CodeGen/{R600 => AMDGPU}/ftrunc.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/ftrunc.ll | 0 test/CodeGen/{R600 => AMDGPU}/gep-address-space.ll | 0 test/CodeGen/{R600 => AMDGPU}/global-directive.ll | 0 test/CodeGen/{R600 => AMDGPU}/global-extload-i1.ll | 0 test/CodeGen/{R600 => AMDGPU}/global-extload-i16.ll | 0 test/CodeGen/{R600 => AMDGPU}/global-extload-i32.ll | 0 test/CodeGen/{R600 => AMDGPU}/global-extload-i8.ll | 0 .../{R600 => AMDGPU}/global-zero-initializer.ll | 0 test/CodeGen/{R600 => AMDGPU}/global_atomics.ll | 0 .../{R600 => AMDGPU}/gv-const-addrspace-fail.ll | 0 test/CodeGen/{R600 => AMDGPU}/gv-const-addrspace.ll | 0 test/CodeGen/{R600 => AMDGPU}/half.ll | 0 test/CodeGen/{R600 => AMDGPU}/hsa.ll | 0 test/CodeGen/{R600 => AMDGPU}/i1-copy-implicit-def.ll | 0 test/CodeGen/{R600 => AMDGPU}/i1-copy-phi.ll | 0 test/CodeGen/{R600 => AMDGPU}/i8-to-double-to-float.ll | 0 .../{R600 => AMDGPU}/icmp-select-sete-reverse-args.ll | 0 test/CodeGen/{R600 => AMDGPU}/icmp64.ll | 0 test/CodeGen/{R600 => AMDGPU}/imm.ll | 0 .../CodeGen/{R600 => AMDGPU}/indirect-addressing-si.ll | 0 test/CodeGen/{R600 => AMDGPU}/indirect-private-64.ll | 0 .../{R600 => AMDGPU}/infinite-loop-evergreen.ll | 0 test/CodeGen/{R600 => AMDGPU}/infinite-loop.ll | 0 test/CodeGen/{R600 => AMDGPU}/inline-asm.ll | 0 test/CodeGen/{R600 => AMDGPU}/inline-calls.ll | 0 test/CodeGen/{R600 => AMDGPU}/input-mods.ll | 0 test/CodeGen/{R600 => AMDGPU}/insert_subreg.ll | 0 test/CodeGen/{R600 => AMDGPU}/insert_vector_elt.ll | 0 test/CodeGen/{R600 => AMDGPU}/jump-address.ll | 0 test/CodeGen/{R600 => AMDGPU}/kcache-fold.ll | 0 test/CodeGen/{R600 => AMDGPU}/kernel-args.ll | 0 test/CodeGen/{R600 => AMDGPU}/large-alloca.ll | 0 .../{R600 => AMDGPU}/large-constant-initializer.ll | 0 test/CodeGen/{R600 => AMDGPU}/lds-initializer.ll | 0 test/CodeGen/{R600 => AMDGPU}/lds-oqap-crash.ll | 0 test/CodeGen/{R600 => AMDGPU}/lds-output-queue.ll | 0 test/CodeGen/{R600 => AMDGPU}/lds-size.ll | 0 test/CodeGen/{R600 => AMDGPU}/lds-zero-initializer.ll | 0 .../{R600 => AMDGPU}/legalizedag-bug-expand-setcc.ll | 0 test/CodeGen/AMDGPU/lit.local.cfg | 2 ++ test/CodeGen/{R600 => AMDGPU}/literals.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.abs.ll | 0 .../{R600 => AMDGPU}/llvm.AMDGPU.barrier.global.ll | 0 .../{R600 => AMDGPU}/llvm.AMDGPU.barrier.local.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfe.i32.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfe.u32.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfi.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfm.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.brev.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.clamp.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.class.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.cube.ll | 0 .../{R600 => AMDGPU}/llvm.AMDGPU.cvt_f32_ubyte.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.div_fixup.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.div_fmas.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.div_scale.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.flbit.i32.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.fract.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.fract.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imad24.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imax.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imin.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imul24.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.kill.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.ldexp.ll | 0 .../CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.legacy.rsq.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.mul.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rcp.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rcp.ll | 0 .../{R600 => AMDGPU}/llvm.AMDGPU.rsq.clamped.f64.ll | 0 .../{R600 => AMDGPU}/llvm.AMDGPU.rsq.clamped.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rsq.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.tex.ll | 0 .../CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.trig_preop.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.trunc.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umad24.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umax.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umin.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umul24.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.fs.interp.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.gather4.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.getlod.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.image.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.image.sample.ll | 0 .../CodeGen/{R600 => AMDGPU}/llvm.SI.image.sample.o.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.imageload.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.load.dword.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.resinfo.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.sample-masked.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.sample.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.sampled.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.sendmsg-m0.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.sendmsg.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.tbuffer.store.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.SI.tid.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.amdgpu.dp4.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.amdgpu.kilp.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.amdgpu.lrp.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.cos.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.exp2.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.log2.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.memcpy.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.pow.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.rint.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.rint.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.round.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.round.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.sin.ll | 0 test/CodeGen/{R600 => AMDGPU}/llvm.sqrt.ll | 0 test/CodeGen/{R600 => AMDGPU}/load-i1.ll | 0 test/CodeGen/{R600 => AMDGPU}/load-input-fold.ll | 0 test/CodeGen/{R600 => AMDGPU}/load.ll | 0 test/CodeGen/{R600 => AMDGPU}/load.vec.ll | 0 test/CodeGen/{R600 => AMDGPU}/load64.ll | 0 test/CodeGen/{R600 => AMDGPU}/local-64.ll | 0 test/CodeGen/{R600 => AMDGPU}/local-atomics.ll | 0 test/CodeGen/{R600 => AMDGPU}/local-atomics64.ll | 0 .../{R600 => AMDGPU}/local-memory-two-objects.ll | 0 test/CodeGen/{R600 => AMDGPU}/local-memory.ll | 0 test/CodeGen/{R600 => AMDGPU}/loop-address.ll | 0 test/CodeGen/{R600 => AMDGPU}/loop-idiom.ll | 0 test/CodeGen/{R600 => AMDGPU}/lshl.ll | 0 test/CodeGen/{R600 => AMDGPU}/lshr.ll | 0 test/CodeGen/{R600 => AMDGPU}/m0-spill.ll | 0 test/CodeGen/{R600 => AMDGPU}/mad-combine.ll | 0 test/CodeGen/{R600 => AMDGPU}/mad-sub.ll | 0 test/CodeGen/{R600 => AMDGPU}/mad_int24.ll | 0 test/CodeGen/{R600 => AMDGPU}/mad_uint24.ll | 0 test/CodeGen/{R600 => AMDGPU}/madak.ll | 0 test/CodeGen/{R600 => AMDGPU}/madmk.ll | 0 test/CodeGen/{R600 => AMDGPU}/max-literals.ll | 0 test/CodeGen/{R600 => AMDGPU}/max.ll | 0 test/CodeGen/{R600 => AMDGPU}/max3.ll | 0 test/CodeGen/{R600 => AMDGPU}/merge-stores.ll | 0 test/CodeGen/{R600 => AMDGPU}/min.ll | 0 test/CodeGen/{R600 => AMDGPU}/min3.ll | 0 test/CodeGen/{R600 => AMDGPU}/missing-store.ll | 0 test/CodeGen/{R600 => AMDGPU}/mubuf.ll | 0 test/CodeGen/{R600 => AMDGPU}/mul.ll | 0 test/CodeGen/{R600 => AMDGPU}/mul_int24.ll | 0 test/CodeGen/{R600 => AMDGPU}/mul_uint24.ll | 0 test/CodeGen/{R600 => AMDGPU}/mulhu.ll | 0 .../no-initializer-constant-addrspace.ll | 0 test/CodeGen/{R600 => AMDGPU}/no-shrink-extloads.ll | 0 test/CodeGen/{R600 => AMDGPU}/operand-folding.ll | 0 test/CodeGen/{R600 => AMDGPU}/operand-spacing.ll | 0 test/CodeGen/{R600 => AMDGPU}/or.ll | 0 test/CodeGen/{R600 => AMDGPU}/packetizer.ll | 0 test/CodeGen/{R600 => AMDGPU}/parallelandifcollapse.ll | 0 test/CodeGen/{R600 => AMDGPU}/parallelorifcollapse.ll | 0 test/CodeGen/{R600 => AMDGPU}/predicate-dp4.ll | 0 test/CodeGen/{R600 => AMDGPU}/predicates.ll | 0 .../CodeGen/{R600 => AMDGPU}/private-memory-atomics.ll | 0 test/CodeGen/{R600 => AMDGPU}/private-memory-broken.ll | 0 test/CodeGen/{R600 => AMDGPU}/private-memory.ll | 0 test/CodeGen/{R600 => AMDGPU}/pv-packing.ll | 0 test/CodeGen/{R600 => AMDGPU}/pv.ll | 0 test/CodeGen/{R600 => AMDGPU}/r600-encoding.ll | 0 test/CodeGen/{R600 => AMDGPU}/r600-export-fix.ll | 0 ...r600-infinite-loop-bug-while-reorganizing-vector.ll | 0 test/CodeGen/{R600 => AMDGPU}/r600cfg.ll | 0 test/CodeGen/{R600 => AMDGPU}/reciprocal.ll | 0 .../{R600 => AMDGPU}/register-count-comments.ll | 0 test/CodeGen/{R600 => AMDGPU}/reorder-stores.ll | 0 test/CodeGen/{R600 => AMDGPU}/rotl.i64.ll | 0 test/CodeGen/{R600 => AMDGPU}/rotl.ll | 0 test/CodeGen/{R600 => AMDGPU}/rotr.i64.ll | 0 test/CodeGen/{R600 => AMDGPU}/rotr.ll | 0 test/CodeGen/{R600 => AMDGPU}/rsq.ll | 0 test/CodeGen/{R600 => AMDGPU}/rv7x0_count3.ll | 0 test/CodeGen/{R600 => AMDGPU}/s_movk_i32.ll | 0 test/CodeGen/{R600 => AMDGPU}/saddo.ll | 0 test/CodeGen/{R600 => AMDGPU}/salu-to-valu.ll | 0 test/CodeGen/{R600 => AMDGPU}/scalar_to_vector.ll | 0 .../{R600 => AMDGPU}/schedule-fs-loop-nested-if.ll | 0 .../{R600 => AMDGPU}/schedule-fs-loop-nested.ll | 0 test/CodeGen/{R600 => AMDGPU}/schedule-fs-loop.ll | 0 test/CodeGen/{R600 => AMDGPU}/schedule-global-loads.ll | 0 test/CodeGen/{R600 => AMDGPU}/schedule-if-2.ll | 0 test/CodeGen/{R600 => AMDGPU}/schedule-if.ll | 0 .../{R600 => AMDGPU}/schedule-kernel-arg-loads.ll | 0 .../schedule-vs-if-nested-loop-failure.ll | 0 .../{R600 => AMDGPU}/schedule-vs-if-nested-loop.ll | 0 test/CodeGen/{R600 => AMDGPU}/scratch-buffer.ll | 0 test/CodeGen/{R600 => AMDGPU}/sdiv.ll | 0 test/CodeGen/{R600 => AMDGPU}/sdivrem24.ll | 0 test/CodeGen/{R600 => AMDGPU}/sdivrem64.ll | 0 test/CodeGen/{R600 => AMDGPU}/select-i1.ll | 0 test/CodeGen/{R600 => AMDGPU}/select-vectors.ll | 0 test/CodeGen/{R600 => AMDGPU}/select.ll | 0 test/CodeGen/{R600 => AMDGPU}/select64.ll | 0 test/CodeGen/{R600 => AMDGPU}/selectcc-cnd.ll | 0 test/CodeGen/{R600 => AMDGPU}/selectcc-cnde-int.ll | 0 .../{R600 => AMDGPU}/selectcc-icmp-select-float.ll | 0 test/CodeGen/{R600 => AMDGPU}/selectcc-opt.ll | 0 test/CodeGen/{R600 => AMDGPU}/selectcc.ll | 0 test/CodeGen/{R600 => AMDGPU}/set-dx10.ll | 0 test/CodeGen/{R600 => AMDGPU}/setcc-equivalent.ll | 0 test/CodeGen/{R600 => AMDGPU}/setcc-opt.ll | 0 test/CodeGen/{R600 => AMDGPU}/setcc.ll | 0 test/CodeGen/{R600 => AMDGPU}/setcc64.ll | 0 test/CodeGen/{R600 => AMDGPU}/seto.ll | 0 test/CodeGen/{R600 => AMDGPU}/setuo.ll | 0 test/CodeGen/{R600 => AMDGPU}/sext-eliminate.ll | 0 test/CodeGen/{R600 => AMDGPU}/sext-in-reg.ll | 0 test/CodeGen/{R600 => AMDGPU}/sgpr-control-flow.ll | 0 .../{R600 => AMDGPU}/sgpr-copy-duplicate-operand.ll | 0 test/CodeGen/{R600 => AMDGPU}/sgpr-copy.ll | 0 test/CodeGen/{R600 => AMDGPU}/shared-op-cycle.ll | 0 test/CodeGen/{R600 => AMDGPU}/shl.ll | 0 test/CodeGen/{R600 => AMDGPU}/shl_add_constant.ll | 0 test/CodeGen/{R600 => AMDGPU}/shl_add_ptr.ll | 0 .../{R600 => AMDGPU}/si-annotate-cf-assertion.ll | 0 test/CodeGen/{R600 => AMDGPU}/si-annotate-cf.ll | 0 test/CodeGen/{R600 => AMDGPU}/si-lod-bias.ll | 0 test/CodeGen/{R600 => AMDGPU}/si-sgpr-spill.ll | 0 test/CodeGen/{R600 => AMDGPU}/si-spill-cf.ll | 0 .../{R600 => AMDGPU}/si-triv-disjoint-mem-access.ll | 0 test/CodeGen/{R600 => AMDGPU}/si-vector-hang.ll | 0 test/CodeGen/{R600 => AMDGPU}/sign_extend.ll | 0 .../simplify-demanded-bits-build-pair.ll | 0 test/CodeGen/{R600 => AMDGPU}/sint_to_fp.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/sint_to_fp.ll | 0 test/CodeGen/{R600 => AMDGPU}/smrd.ll | 0 test/CodeGen/{R600 => AMDGPU}/split-scalar-i64-add.ll | 0 test/CodeGen/{R600 => AMDGPU}/sra.ll | 0 test/CodeGen/{R600 => AMDGPU}/srem.ll | 0 test/CodeGen/{R600 => AMDGPU}/srl.ll | 0 test/CodeGen/{R600 => AMDGPU}/ssubo.ll | 0 test/CodeGen/{R600 => AMDGPU}/store-barrier.ll | 0 test/CodeGen/{R600 => AMDGPU}/store-v3i32.ll | 0 test/CodeGen/{R600 => AMDGPU}/store-v3i64.ll | 0 test/CodeGen/{R600 => AMDGPU}/store-vector-ptrs.ll | 0 test/CodeGen/{R600 => AMDGPU}/store.ll | 0 test/CodeGen/{R600 => AMDGPU}/store.r600.ll | 0 test/CodeGen/{R600 => AMDGPU}/structurize.ll | 0 test/CodeGen/{R600 => AMDGPU}/structurize1.ll | 0 test/CodeGen/{R600 => AMDGPU}/sub.ll | 0 .../CodeGen/{R600 => AMDGPU}/subreg-coalescer-crash.ll | 0 test/CodeGen/{R600 => AMDGPU}/subreg-eliminate-dead.ll | 0 test/CodeGen/{R600 => AMDGPU}/swizzle-export.ll | 0 test/CodeGen/{R600 => AMDGPU}/tex-clause-antidep.ll | 0 test/CodeGen/{R600 => AMDGPU}/texture-input-merge.ll | 0 test/CodeGen/{R600 => AMDGPU}/trunc-cmp-constant.ll | 0 .../CodeGen/{R600 => AMDGPU}/trunc-store-f64-to-f16.ll | 0 test/CodeGen/{R600 => AMDGPU}/trunc-store-i1.ll | 0 .../trunc-vector-store-assertion-failure.ll | 0 test/CodeGen/{R600 => AMDGPU}/trunc.ll | 0 test/CodeGen/{R600 => AMDGPU}/tti-unroll-prefs.ll | 0 test/CodeGen/{R600 => AMDGPU}/uaddo.ll | 0 test/CodeGen/{R600 => AMDGPU}/udiv.ll | 0 test/CodeGen/{R600 => AMDGPU}/udivrem.ll | 0 test/CodeGen/{R600 => AMDGPU}/udivrem24.ll | 0 test/CodeGen/{R600 => AMDGPU}/udivrem64.ll | 0 test/CodeGen/{R600 => AMDGPU}/uint_to_fp.f64.ll | 0 test/CodeGen/{R600 => AMDGPU}/uint_to_fp.ll | 0 test/CodeGen/{R600 => AMDGPU}/unaligned-load-store.ll | 0 .../unhandled-loop-condition-assertion.ll | 0 test/CodeGen/{R600 => AMDGPU}/unroll.ll | 0 test/CodeGen/{R600 => AMDGPU}/unsupported-cc.ll | 0 test/CodeGen/{R600 => AMDGPU}/urecip.ll | 0 test/CodeGen/{R600 => AMDGPU}/urem.ll | 0 .../{R600 => AMDGPU}/use-sgpr-multiple-times.ll | 0 test/CodeGen/{R600 => AMDGPU}/usubo.ll | 0 test/CodeGen/{R600 => AMDGPU}/v1i64-kernel-arg.ll | 0 test/CodeGen/{R600 => AMDGPU}/v_cndmask.ll | 0 test/CodeGen/{R600 => AMDGPU}/valu-i1.ll | 0 test/CodeGen/{R600 => AMDGPU}/vector-alloca.ll | 0 test/CodeGen/{R600 => AMDGPU}/vertex-fetch-encoding.ll | 0 test/CodeGen/{R600 => AMDGPU}/vop-shrink.ll | 0 test/CodeGen/{R600 => AMDGPU}/vselect.ll | 0 test/CodeGen/{R600 => AMDGPU}/vselect64.ll | 0 test/CodeGen/{R600 => AMDGPU}/vtx-fetch-branch.ll | 0 test/CodeGen/{R600 => AMDGPU}/vtx-schedule.ll | 0 test/CodeGen/{R600 => AMDGPU}/wait.ll | 0 test/CodeGen/{R600 => AMDGPU}/work-item-intrinsics.ll | 0 .../CodeGen/{R600 => AMDGPU}/wrong-transalu-pos-fix.ll | 0 test/CodeGen/{R600 => AMDGPU}/xor.ll | 0 test/CodeGen/{R600 => AMDGPU}/zero_extend.ll | 0 test/CodeGen/R600/lit.local.cfg | 2 -- test/MC/{R600 => AMDGPU}/ds-err.s | 0 test/MC/{R600 => AMDGPU}/ds.s | 0 test/MC/{R600 => AMDGPU}/flat.s | 0 test/MC/AMDGPU/lit.local.cfg | 2 ++ test/MC/{R600 => AMDGPU}/mubuf.s | 0 test/MC/{R600 => AMDGPU}/smrd.s | 0 test/MC/{R600 => AMDGPU}/sop1-err.s | 0 test/MC/{R600 => AMDGPU}/sop1.s | 0 test/MC/{R600 => AMDGPU}/sop2.s | 0 test/MC/{R600 => AMDGPU}/sopc.s | 0 test/MC/{R600 => AMDGPU}/sopk.s | 0 test/MC/{R600 => AMDGPU}/sopp.s | 0 test/MC/{R600 => AMDGPU}/vop1.s | 0 test/MC/{R600 => AMDGPU}/vop2-err.s | 0 test/MC/{R600 => AMDGPU}/vop2.s | 0 test/MC/{R600 => AMDGPU}/vop3-errs.s | 0 test/MC/{R600 => AMDGPU}/vop3.s | 0 test/MC/{R600 => AMDGPU}/vopc.s | 0 test/MC/R600/lit.local.cfg | 2 -- 552 files changed, 62 insertions(+), 60 deletions(-) rename docs/{R600Usage.rst => AMDGPUUsage.rst} (91%) rename lib/Target/{R600 => AMDGPU}/AMDGPU.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPU.td (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUAlwaysInlinePass.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUAsmPrinter.cpp (99%) rename lib/Target/{R600 => AMDGPU}/AMDGPUAsmPrinter.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUCallingConv.td (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUFrameLowering.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUFrameLowering.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUISelDAGToDAG.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUISelLowering.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUISelLowering.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUInstrInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUInstrInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUInstrInfo.td (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUInstructions.td (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUIntrinsicInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUIntrinsicInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUIntrinsics.td (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUMCInstLower.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUMCInstLower.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUMachineFunction.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUMachineFunction.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUPromoteAlloca.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPURegisterInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPURegisterInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPURegisterInfo.td (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUSubtarget.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUSubtarget.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUTargetMachine.cpp (99%) rename lib/Target/{R600 => AMDGPU}/AMDGPUTargetMachine.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUTargetTransformInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDGPUTargetTransformInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/AMDILCFGStructurizer.cpp (100%) rename lib/Target/{R600 => AMDGPU}/AMDKernelCodeT.h (100%) rename lib/Target/{R600 => AMDGPU}/AsmParser/AMDGPUAsmParser.cpp (99%) create mode 100644 lib/Target/AMDGPU/AsmParser/CMakeLists.txt rename lib/Target/{R600/MCTargetDesc => AMDGPU/AsmParser}/LLVMBuild.txt (72%) rename lib/Target/{R600 => AMDGPU}/AsmParser/Makefile (100%) rename lib/Target/{R600 => AMDGPU}/CIInstructions.td (100%) rename lib/Target/{R600 => AMDGPU}/CMakeLists.txt (98%) rename lib/Target/{R600 => AMDGPU}/CaymanInstructions.td (100%) rename lib/Target/{R600 => AMDGPU}/EvergreenInstructions.td (100%) rename lib/Target/{R600 => AMDGPU}/InstPrinter/AMDGPUInstPrinter.cpp (100%) rename lib/Target/{R600 => AMDGPU}/InstPrinter/AMDGPUInstPrinter.h (100%) create mode 100644 lib/Target/AMDGPU/InstPrinter/CMakeLists.txt rename lib/Target/{R600 => AMDGPU}/InstPrinter/LLVMBuild.txt (79%) rename lib/Target/{R600 => AMDGPU}/InstPrinter/Makefile (100%) rename lib/Target/{R600 => AMDGPU}/LLVMBuild.txt (76%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUAsmBackend.cpp (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUELFObjectWriter.cpp (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUFixupKinds.h (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCAsmInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCAsmInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCCodeEmitter.cpp (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCCodeEmitter.h (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCTargetDesc.cpp (98%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/AMDGPUMCTargetDesc.h (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/CMakeLists.txt (84%) rename lib/Target/{R600/AsmParser => AMDGPU/MCTargetDesc}/LLVMBuild.txt (72%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/Makefile (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/R600MCCodeEmitter.cpp (100%) rename lib/Target/{R600 => AMDGPU}/MCTargetDesc/SIMCCodeEmitter.cpp (100%) rename lib/Target/{R600 => AMDGPU}/Makefile (100%) rename lib/Target/{R600 => AMDGPU}/Processors.td (100%) rename lib/Target/{R600 => AMDGPU}/R600ClauseMergePass.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600ControlFlowFinalizer.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600Defines.h (100%) rename lib/Target/{R600 => AMDGPU}/R600EmitClauseMarkers.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600ExpandSpecialInstrs.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600ISelLowering.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600ISelLowering.h (100%) rename lib/Target/{R600 => AMDGPU}/R600InstrFormats.td (100%) rename lib/Target/{R600 => AMDGPU}/R600InstrInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600InstrInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/R600Instructions.td (100%) rename lib/Target/{R600 => AMDGPU}/R600Intrinsics.td (100%) rename lib/Target/{R600 => AMDGPU}/R600MachineFunctionInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600MachineFunctionInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/R600MachineScheduler.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600MachineScheduler.h (100%) rename lib/Target/{R600 => AMDGPU}/R600OptimizeVectorRegisters.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600Packetizer.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600RegisterInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R600RegisterInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/R600RegisterInfo.td (100%) rename lib/Target/{R600 => AMDGPU}/R600Schedule.td (100%) rename lib/Target/{R600 => AMDGPU}/R600TextureIntrinsicsReplacer.cpp (100%) rename lib/Target/{R600 => AMDGPU}/R700Instructions.td (100%) rename lib/Target/{R600 => AMDGPU}/SIAnnotateControlFlow.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIDefines.h (100%) rename lib/Target/{R600 => AMDGPU}/SIFixControlFlowLiveIntervals.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIFixSGPRCopies.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIFixSGPRLiveRanges.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIFoldOperands.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIISelLowering.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIISelLowering.h (100%) rename lib/Target/{R600 => AMDGPU}/SIInsertWaits.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIInstrFormats.td (100%) rename lib/Target/{R600 => AMDGPU}/SIInstrInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIInstrInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/SIInstrInfo.td (100%) rename lib/Target/{R600 => AMDGPU}/SIInstructions.td (100%) rename lib/Target/{R600 => AMDGPU}/SIIntrinsics.td (100%) rename lib/Target/{R600 => AMDGPU}/SILoadStoreOptimizer.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SILowerControlFlow.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SILowerI1Copies.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIMachineFunctionInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIMachineFunctionInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/SIPrepareScratchRegs.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIRegisterInfo.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SIRegisterInfo.h (100%) rename lib/Target/{R600 => AMDGPU}/SIRegisterInfo.td (100%) rename lib/Target/{R600 => AMDGPU}/SISchedule.td (100%) rename lib/Target/{R600 => AMDGPU}/SIShrinkInstructions.cpp (100%) rename lib/Target/{R600 => AMDGPU}/SITypeRewriter.cpp (100%) rename lib/Target/{R600 => AMDGPU}/TargetInfo/AMDGPUTargetInfo.cpp (95%) create mode 100644 lib/Target/AMDGPU/TargetInfo/CMakeLists.txt rename lib/Target/{R600 => AMDGPU}/TargetInfo/LLVMBuild.txt (79%) rename lib/Target/{R600 => AMDGPU}/TargetInfo/Makefile (100%) rename lib/Target/{R600 => AMDGPU}/VIInstrFormats.td (100%) rename lib/Target/{R600 => AMDGPU}/VIInstructions.td (100%) delete mode 100644 lib/Target/R600/AsmParser/CMakeLists.txt delete mode 100644 lib/Target/R600/InstPrinter/CMakeLists.txt delete mode 100644 lib/Target/R600/TargetInfo/CMakeLists.txt rename test/CodeGen/{R600 => AMDGPU}/32-bit-local-address-space.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/README (100%) rename test/CodeGen/{R600 => AMDGPU}/add-debug.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/add.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/add_i64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/address-space.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/and.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/anyext.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/array-ptr-calc-i32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/array-ptr-calc-i64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/atomic_cmp_swap_local.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/atomic_load_add.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/atomic_load_sub.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/basic-branch.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/basic-loop.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/bfe_uint.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/bfi_int.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/big_alu.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/bitcast.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/bswap.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/build_vector.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/call.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/call_fs.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cayman-loop-bug.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cf-stack-bug.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cf_end.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cgp-addressing-modes.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/coalescer_remat.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/codegen-prepare-addrmode-sext.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/combine_vloads.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/commute-compares.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/commute_modifiers.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/complex-folding.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/concat_vectors.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/copy-illegal-type.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/copy-to-reg.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ctlz_zero_undef.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ctpop.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ctpop64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cttz_zero_undef.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cvt_f32_ubyte.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cvt_flr_i32_f32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/cvt_rpi_i32_f32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/dagcombiner-bug-illegal-vec4-int-to-fp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/debug.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/default-fp-mode.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/disconnected-predset-break-bug.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/dot4-folding.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ds-negative-offset-addressing-mode-loop.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ds_read2.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ds_read2_offset_order.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ds_read2st64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ds_write2.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ds_write2st64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/elf.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/elf.r600.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/empty-function.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/endcf-loop-header.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/extload-private.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/extload.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/extract_vector_elt_i16.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fabs.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fabs.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fadd.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fadd64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fceil.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fceil64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fcmp-cnd.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fcmp-cnde-int-args.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fcmp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fcmp64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fconst64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fcopysign.f32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fcopysign.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fdiv.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fdiv.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fetch-limits.r600.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fetch-limits.r700+.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ffloor.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ffloor.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/flat-address-space.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/floor.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fma-combine.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fma.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fma.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmad.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmax.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmax3.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmax3.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmax_legacy.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmax_legacy.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmaxnum.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmaxnum.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmin.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmin3.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmin_legacy.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmin_legacy.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fminnum.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fminnum.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmul.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmul64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fmuladd.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fnearbyint.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fneg-fabs.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fneg-fabs.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fneg.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fneg.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fp-classify.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fp16_to_fp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fp32_to_fp16.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fp_to_sint.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fp_to_sint.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fp_to_uint.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fp_to_uint.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fpext.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fptrunc.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/frem.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fsqrt.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fsub.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/fsub64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ftrunc.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ftrunc.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/gep-address-space.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/global-directive.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/global-extload-i1.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/global-extload-i16.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/global-extload-i32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/global-extload-i8.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/global-zero-initializer.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/global_atomics.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/gv-const-addrspace-fail.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/gv-const-addrspace.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/half.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/hsa.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/i1-copy-implicit-def.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/i1-copy-phi.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/i8-to-double-to-float.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/icmp-select-sete-reverse-args.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/icmp64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/imm.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/indirect-addressing-si.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/indirect-private-64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/infinite-loop-evergreen.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/infinite-loop.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/inline-asm.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/inline-calls.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/input-mods.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/insert_subreg.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/insert_vector_elt.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/jump-address.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/kcache-fold.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/kernel-args.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/large-alloca.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/large-constant-initializer.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/lds-initializer.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/lds-oqap-crash.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/lds-output-queue.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/lds-size.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/lds-zero-initializer.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/legalizedag-bug-expand-setcc.ll (100%) create mode 100644 test/CodeGen/AMDGPU/lit.local.cfg rename test/CodeGen/{R600 => AMDGPU}/literals.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.abs.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.barrier.global.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.barrier.local.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfe.i32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfe.u32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfi.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.bfm.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.brev.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.clamp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.class.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.cube.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.cvt_f32_ubyte.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.div_fixup.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.div_fmas.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.div_scale.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.flbit.i32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.fract.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.fract.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imad24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imax.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imin.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.imul24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.kill.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.ldexp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.legacy.rsq.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.mul.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rcp.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rcp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rsq.clamped.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rsq.clamped.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.rsq.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.tex.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.trig_preop.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.trunc.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umad24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umax.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umin.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.AMDGPU.umul24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.fs.interp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.gather4.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.getlod.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.image.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.image.sample.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.image.sample.o.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.imageload.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.load.dword.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.resinfo.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.sample-masked.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.sample.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.sampled.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.sendmsg-m0.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.sendmsg.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.tbuffer.store.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.SI.tid.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.amdgpu.dp4.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.amdgpu.kilp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.amdgpu.lrp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.cos.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.exp2.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.log2.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.memcpy.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.pow.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.rint.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.rint.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.round.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.round.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.sin.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/llvm.sqrt.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/load-i1.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/load-input-fold.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/load.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/load.vec.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/load64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/local-64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/local-atomics.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/local-atomics64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/local-memory-two-objects.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/local-memory.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/loop-address.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/loop-idiom.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/lshl.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/lshr.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/m0-spill.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mad-combine.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mad-sub.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mad_int24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mad_uint24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/madak.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/madmk.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/max-literals.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/max.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/max3.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/merge-stores.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/min.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/min3.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/missing-store.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mubuf.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mul.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mul_int24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mul_uint24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/mulhu.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/no-initializer-constant-addrspace.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/no-shrink-extloads.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/operand-folding.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/operand-spacing.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/or.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/packetizer.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/parallelandifcollapse.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/parallelorifcollapse.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/predicate-dp4.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/predicates.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/private-memory-atomics.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/private-memory-broken.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/private-memory.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/pv-packing.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/pv.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/r600-encoding.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/r600-export-fix.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/r600-infinite-loop-bug-while-reorganizing-vector.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/r600cfg.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/reciprocal.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/register-count-comments.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/reorder-stores.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/rotl.i64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/rotl.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/rotr.i64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/rotr.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/rsq.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/rv7x0_count3.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/s_movk_i32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/saddo.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/salu-to-valu.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/scalar_to_vector.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-fs-loop-nested-if.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-fs-loop-nested.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-fs-loop.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-global-loads.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-if-2.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-if.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-kernel-arg-loads.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-vs-if-nested-loop-failure.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/schedule-vs-if-nested-loop.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/scratch-buffer.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sdiv.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sdivrem24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sdivrem64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/select-i1.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/select-vectors.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/select.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/select64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/selectcc-cnd.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/selectcc-cnde-int.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/selectcc-icmp-select-float.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/selectcc-opt.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/selectcc.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/set-dx10.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/setcc-equivalent.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/setcc-opt.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/setcc.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/setcc64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/seto.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/setuo.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sext-eliminate.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sext-in-reg.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sgpr-control-flow.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sgpr-copy-duplicate-operand.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sgpr-copy.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/shared-op-cycle.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/shl.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/shl_add_constant.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/shl_add_ptr.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/si-annotate-cf-assertion.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/si-annotate-cf.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/si-lod-bias.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/si-sgpr-spill.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/si-spill-cf.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/si-triv-disjoint-mem-access.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/si-vector-hang.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sign_extend.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/simplify-demanded-bits-build-pair.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sint_to_fp.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sint_to_fp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/smrd.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/split-scalar-i64-add.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sra.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/srem.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/srl.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/ssubo.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/store-barrier.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/store-v3i32.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/store-v3i64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/store-vector-ptrs.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/store.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/store.r600.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/structurize.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/structurize1.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/sub.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/subreg-coalescer-crash.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/subreg-eliminate-dead.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/swizzle-export.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/tex-clause-antidep.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/texture-input-merge.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/trunc-cmp-constant.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/trunc-store-f64-to-f16.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/trunc-store-i1.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/trunc-vector-store-assertion-failure.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/trunc.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/tti-unroll-prefs.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/uaddo.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/udiv.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/udivrem.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/udivrem24.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/udivrem64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/uint_to_fp.f64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/uint_to_fp.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/unaligned-load-store.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/unhandled-loop-condition-assertion.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/unroll.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/unsupported-cc.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/urecip.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/urem.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/use-sgpr-multiple-times.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/usubo.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/v1i64-kernel-arg.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/v_cndmask.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/valu-i1.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/vector-alloca.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/vertex-fetch-encoding.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/vop-shrink.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/vselect.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/vselect64.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/vtx-fetch-branch.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/vtx-schedule.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/wait.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/work-item-intrinsics.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/wrong-transalu-pos-fix.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/xor.ll (100%) rename test/CodeGen/{R600 => AMDGPU}/zero_extend.ll (100%) delete mode 100644 test/CodeGen/R600/lit.local.cfg rename test/MC/{R600 => AMDGPU}/ds-err.s (100%) rename test/MC/{R600 => AMDGPU}/ds.s (100%) rename test/MC/{R600 => AMDGPU}/flat.s (100%) create mode 100644 test/MC/AMDGPU/lit.local.cfg rename test/MC/{R600 => AMDGPU}/mubuf.s (100%) rename test/MC/{R600 => AMDGPU}/smrd.s (100%) rename test/MC/{R600 => AMDGPU}/sop1-err.s (100%) rename test/MC/{R600 => AMDGPU}/sop1.s (100%) rename test/MC/{R600 => AMDGPU}/sop2.s (100%) rename test/MC/{R600 => AMDGPU}/sopc.s (100%) rename test/MC/{R600 => AMDGPU}/sopk.s (100%) rename test/MC/{R600 => AMDGPU}/sopp.s (100%) rename test/MC/{R600 => AMDGPU}/vop1.s (100%) rename test/MC/{R600 => AMDGPU}/vop2-err.s (100%) rename test/MC/{R600 => AMDGPU}/vop2.s (100%) rename test/MC/{R600 => AMDGPU}/vop3-errs.s (100%) rename test/MC/{R600 => AMDGPU}/vop3.s (100%) rename test/MC/{R600 => AMDGPU}/vopc.s (100%) delete mode 100644 test/MC/R600/lit.local.cfg diff --git a/CMakeLists.txt b/CMakeLists.txt index 026fe479abd..da731497997 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,6 +176,7 @@ set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) set(LLVM_ALL_TARGETS AArch64 + AMDGPU ARM BPF CppBackend @@ -184,7 +185,6 @@ set(LLVM_ALL_TARGETS MSP430 NVPTX PowerPC - R600 Sparc SystemZ X86 diff --git a/autoconf/configure.ac b/autoconf/configure.ac index 11ba0511799..5b70fbd1bbf 100644 --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -1097,7 +1097,7 @@ if test "$llvm_cv_enable_crash_overrides" = "yes" ; then fi dnl List all possible targets -ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ R600 BPF" +ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ AMDGPU BPF" AC_SUBST(ALL_TARGETS,$ALL_TARGETS) dnl Allow specific targets to be specified for building (or not) @@ -1132,7 +1132,8 @@ case "$enableval" in hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; systemz) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; - r600) TARGETS_TO_BUILD="R600 $TARGETS_TO_BUILD" ;; + amdgpu) ;& + r600) TARGETS_TO_BUILD="AMDGPU $TARGETS_TO_BUILD" ;; host) case "$llvm_cv_target_arch" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; diff --git a/configure b/configure index 6cb9f2d9281..73fce67b058 100755 --- a/configure +++ b/configure @@ -5628,7 +5628,7 @@ _ACEOF fi -ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ R600 BPF" +ALL_TARGETS="X86 Sparc PowerPC ARM AArch64 Mips XCore MSP430 CppBackend NVPTX Hexagon SystemZ AMDGPU BPF" ALL_TARGETS=$ALL_TARGETS @@ -5665,7 +5665,8 @@ case "$enableval" in hexagon) TARGETS_TO_BUILD="Hexagon $TARGETS_TO_BUILD" ;; nvptx) TARGETS_TO_BUILD="NVPTX $TARGETS_TO_BUILD" ;; systemz) TARGETS_TO_BUILD="SystemZ $TARGETS_TO_BUILD" ;; - r600) TARGETS_TO_BUILD="R600 $TARGETS_TO_BUILD" ;; + amdgpu) ;& + r600) TARGETS_TO_BUILD="AMDGPU $TARGETS_TO_BUILD" ;; host) case "$llvm_cv_target_arch" in x86) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; x86_64) TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;; diff --git a/docs/R600Usage.rst b/docs/AMDGPUUsage.rst similarity index 91% rename from docs/R600Usage.rst rename to docs/AMDGPUUsage.rst index 9bd16f46098..3cb41cebfff 100644 --- a/docs/R600Usage.rst +++ b/docs/AMDGPUUsage.rst @@ -1,11 +1,11 @@ -============================ -User Guide for R600 Back-end -============================ +============================== +User Guide for AMDGPU Back-end +============================== Introduction ============ -The R600 back-end provides ISA code generation for AMD GPUs, starting with +The AMDGPU back-end provides ISA code generation for AMD GPUs, starting with the R600 family up until the current Volcanic Islands (GCN Gen 3). @@ -14,7 +14,7 @@ Assembler The assembler is currently considered experimental. -For syntax examples look in test/MC/R600. +For syntax examples look in test/MC/AMDGPU. Below some of the currently supported features (modulo bugs). These all apply to the Southern Islands ISA, Sea Islands and Volcanic Islands diff --git a/docs/CompilerWriterInfo.rst b/docs/CompilerWriterInfo.rst index 2dfdc9b142d..900ba24e230 100644 --- a/docs/CompilerWriterInfo.rst +++ b/docs/CompilerWriterInfo.rst @@ -68,8 +68,8 @@ Other documents, collections, notes * `PowerPC64 alignment of long doubles (from GCC) `_ * `Long branch stubs for powerpc64-linux (from binutils) `_ -R600 ----- +AMDGPU +------ * `AMD R6xx shader ISA `_ * `AMD R7xx shader ISA `_ diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst index 18b3c1d87cc..212fa0b5833 100644 --- a/docs/GettingStarted.rst +++ b/docs/GettingStarted.rst @@ -711,7 +711,7 @@ used by people developing LLVM. | | as ``LLVM_ALL_TARGETS``, and can be set to include | | | out-of-tree targets. The default value includes: | | | ``AArch64, ARM, CppBackend, Hexagon, | -| | Mips, MSP430, NVPTX, PowerPC, R600, Sparc, | +| | Mips, MSP430, NVPTX, PowerPC, AMDGPU, Sparc, | | | SystemZ, X86, XCore``. | +-------------------------+----------------------------------------------------+ | LLVM_ENABLE_DOXYGEN | Build doxygen-based documentation from the source | diff --git a/docs/index.rst b/docs/index.rst index 2cc5b8bf095..0b681180970 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -252,7 +252,7 @@ For API clients and LLVM developers. WritingAnLLVMPass HowToUseAttributes NVPTXUsage - R600Usage + AMDGPUUsage StackMaps InAlloca BigEndianNEON @@ -338,8 +338,8 @@ For API clients and LLVM developers. :doc:`NVPTXUsage` This document describes using the NVPTX back-end to compile GPU kernels. -:doc:`R600Usage` - This document describes how to use the R600 back-end. +:doc:`AMDGPUUsage` + This document describes how to use the AMDGPU back-end. :doc:`StackMaps` LLVM support for mapping instruction addresses to the location of diff --git a/lib/Target/R600/AMDGPU.h b/lib/Target/AMDGPU/AMDGPU.h similarity index 100% rename from lib/Target/R600/AMDGPU.h rename to lib/Target/AMDGPU/AMDGPU.h diff --git a/lib/Target/R600/AMDGPU.td b/lib/Target/AMDGPU/AMDGPU.td similarity index 100% rename from lib/Target/R600/AMDGPU.td rename to lib/Target/AMDGPU/AMDGPU.td diff --git a/lib/Target/R600/AMDGPUAlwaysInlinePass.cpp b/lib/Target/AMDGPU/AMDGPUAlwaysInlinePass.cpp similarity index 100% rename from lib/Target/R600/AMDGPUAlwaysInlinePass.cpp rename to lib/Target/AMDGPU/AMDGPUAlwaysInlinePass.cpp diff --git a/lib/Target/R600/AMDGPUAsmPrinter.cpp b/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp similarity index 99% rename from lib/Target/R600/AMDGPUAsmPrinter.cpp rename to lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp index 56b50a9c159..29c2da61add 100644 --- a/lib/Target/R600/AMDGPUAsmPrinter.cpp +++ b/lib/Target/AMDGPU/AMDGPUAsmPrinter.cpp @@ -80,7 +80,7 @@ createAMDGPUAsmPrinterPass(TargetMachine &tm, return new AMDGPUAsmPrinter(tm, std::move(Streamer)); } -extern "C" void LLVMInitializeR600AsmPrinter() { +extern "C" void LLVMInitializeAMDGPUAsmPrinter() { TargetRegistry::RegisterAsmPrinter(TheAMDGPUTarget, createAMDGPUAsmPrinterPass); TargetRegistry::RegisterAsmPrinter(TheGCNTarget, createAMDGPUAsmPrinterPass); } diff --git a/lib/Target/R600/AMDGPUAsmPrinter.h b/lib/Target/AMDGPU/AMDGPUAsmPrinter.h similarity index 100% rename from lib/Target/R600/AMDGPUAsmPrinter.h rename to lib/Target/AMDGPU/AMDGPUAsmPrinter.h diff --git a/lib/Target/R600/AMDGPUCallingConv.td b/lib/Target/AMDGPU/AMDGPUCallingConv.td similarity index 100% rename from lib/Target/R600/AMDGPUCallingConv.td rename to lib/Target/AMDGPU/AMDGPUCallingConv.td diff --git a/lib/Target/R600/AMDGPUFrameLowering.cpp b/lib/Target/AMDGPU/AMDGPUFrameLowering.cpp similarity index 100% rename from lib/Target/R600/AMDGPUFrameLowering.cpp rename to lib/Target/AMDGPU/AMDGPUFrameLowering.cpp diff --git a/lib/Target/R600/AMDGPUFrameLowering.h b/lib/Target/AMDGPU/AMDGPUFrameLowering.h similarity index 100% rename from lib/Target/R600/AMDGPUFrameLowering.h rename to lib/Target/AMDGPU/AMDGPUFrameLowering.h diff --git a/lib/Target/R600/AMDGPUISelDAGToDAG.cpp b/lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp similarity index 100% rename from lib/Target/R600/AMDGPUISelDAGToDAG.cpp rename to lib/Target/AMDGPU/AMDGPUISelDAGToDAG.cpp diff --git a/lib/Target/R600/AMDGPUISelLowering.cpp b/lib/Target/AMDGPU/AMDGPUISelLowering.cpp similarity index 100% rename from lib/Target/R600/AMDGPUISelLowering.cpp rename to lib/Target/AMDGPU/AMDGPUISelLowering.cpp diff --git a/lib/Target/R600/AMDGPUISelLowering.h b/lib/Target/AMDGPU/AMDGPUISelLowering.h similarity index 100% rename from lib/Target/R600/AMDGPUISelLowering.h rename to lib/Target/AMDGPU/AMDGPUISelLowering.h diff --git a/lib/Target/R600/AMDGPUInstrInfo.cpp b/lib/Target/AMDGPU/AMDGPUInstrInfo.cpp similarity index 100% rename from lib/Target/R600/AMDGPUInstrInfo.cpp rename to lib/Target/AMDGPU/AMDGPUInstrInfo.cpp diff --git a/lib/Target/R600/AMDGPUInstrInfo.h b/lib/Target/AMDGPU/AMDGPUInstrInfo.h similarity index 100% rename from lib/Target/R600/AMDGPUInstrInfo.h rename to lib/Target/AMDGPU/AMDGPUInstrInfo.h diff --git a/lib/Target/R600/AMDGPUInstrInfo.td b/lib/Target/AMDGPU/AMDGPUInstrInfo.td similarity index 100% rename from lib/Target/R600/AMDGPUInstrInfo.td rename to lib/Target/AMDGPU/AMDGPUInstrInfo.td diff --git a/lib/Target/R600/AMDGPUInstructions.td b/lib/Target/AMDGPU/AMDGPUInstructions.td similarity index 100% rename from lib/Target/R600/AMDGPUInstructions.td rename to lib/Target/AMDGPU/AMDGPUInstructions.td diff --git a/lib/Target/R600/AMDGPUIntrinsicInfo.cpp b/lib/Target/AMDGPU/AMDGPUIntrinsicInfo.cpp similarity index 100% rename from lib/Target/R600/AMDGPUIntrinsicInfo.cpp rename to lib/Target/AMDGPU/AMDGPUIntrinsicInfo.cpp diff --git a/lib/Target/R600/AMDGPUIntrinsicInfo.h b/lib/Target/AMDGPU/AMDGPUIntrinsicInfo.h similarity index 100% rename from lib/Target/R600/AMDGPUIntrinsicInfo.h rename to lib/Target/AMDGPU/AMDGPUIntrinsicInfo.h diff --git a/lib/Target/R600/AMDGPUIntrinsics.td b/lib/Target/AMDGPU/AMDGPUIntrinsics.td similarity index 100% rename from lib/Target/R600/AMDGPUIntrinsics.td rename to lib/Target/AMDGPU/AMDGPUIntrinsics.td diff --git a/lib/Target/R600/AMDGPUMCInstLower.cpp b/lib/Target/AMDGPU/AMDGPUMCInstLower.cpp similarity index 100% rename from lib/Target/R600/AMDGPUMCInstLower.cpp rename to lib/Target/AMDGPU/AMDGPUMCInstLower.cpp diff --git a/lib/Target/R600/AMDGPUMCInstLower.h b/lib/Target/AMDGPU/AMDGPUMCInstLower.h similarity index 100% rename from lib/Target/R600/AMDGPUMCInstLower.h rename to lib/Target/AMDGPU/AMDGPUMCInstLower.h diff --git a/lib/Target/R600/AMDGPUMachineFunction.cpp b/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp similarity index 100% rename from lib/Target/R600/AMDGPUMachineFunction.cpp rename to lib/Target/AMDGPU/AMDGPUMachineFunction.cpp diff --git a/lib/Target/R600/AMDGPUMachineFunction.h b/lib/Target/AMDGPU/AMDGPUMachineFunction.h similarity index 100% rename from lib/Target/R600/AMDGPUMachineFunction.h rename to lib/Target/AMDGPU/AMDGPUMachineFunction.h diff --git a/lib/Target/R600/AMDGPUPromoteAlloca.cpp b/lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp similarity index 100% rename from lib/Target/R600/AMDGPUPromoteAlloca.cpp rename to lib/Target/AMDGPU/AMDGPUPromoteAlloca.cpp diff --git a/lib/Target/R600/AMDGPURegisterInfo.cpp b/lib/Target/AMDGPU/AMDGPURegisterInfo.cpp similarity index 100% rename from lib/Target/R600/AMDGPURegisterInfo.cpp rename to lib/Target/AMDGPU/AMDGPURegisterInfo.cpp diff --git a/lib/Target/R600/AMDGPURegisterInfo.h b/lib/Target/AMDGPU/AMDGPURegisterInfo.h similarity index 100% rename from lib/Target/R600/AMDGPURegisterInfo.h rename to lib/Target/AMDGPU/AMDGPURegisterInfo.h diff --git a/lib/Target/R600/AMDGPURegisterInfo.td b/lib/Target/AMDGPU/AMDGPURegisterInfo.td similarity index 100% rename from lib/Target/R600/AMDGPURegisterInfo.td rename to lib/Target/AMDGPU/AMDGPURegisterInfo.td diff --git a/lib/Target/R600/AMDGPUSubtarget.cpp b/lib/Target/AMDGPU/AMDGPUSubtarget.cpp similarity index 100% rename from lib/Target/R600/AMDGPUSubtarget.cpp rename to lib/Target/AMDGPU/AMDGPUSubtarget.cpp diff --git a/lib/Target/R600/AMDGPUSubtarget.h b/lib/Target/AMDGPU/AMDGPUSubtarget.h similarity index 100% rename from lib/Target/R600/AMDGPUSubtarget.h rename to lib/Target/AMDGPU/AMDGPUSubtarget.h diff --git a/lib/Target/R600/AMDGPUTargetMachine.cpp b/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp similarity index 99% rename from lib/Target/R600/AMDGPUTargetMachine.cpp rename to lib/Target/AMDGPU/AMDGPUTargetMachine.cpp index d65c010888a..a9a911a8efe 100644 --- a/lib/Target/R600/AMDGPUTargetMachine.cpp +++ b/lib/Target/AMDGPU/AMDGPUTargetMachine.cpp @@ -37,7 +37,7 @@ using namespace llvm; -extern "C" void LLVMInitializeR600Target() { +extern "C" void LLVMInitializeAMDGPUTarget() { // Register the target RegisterTargetMachine X(TheAMDGPUTarget); RegisterTargetMachine Y(TheGCNTarget); diff --git a/lib/Target/R600/AMDGPUTargetMachine.h b/lib/Target/AMDGPU/AMDGPUTargetMachine.h similarity index 100% rename from lib/Target/R600/AMDGPUTargetMachine.h rename to lib/Target/AMDGPU/AMDGPUTargetMachine.h diff --git a/lib/Target/R600/AMDGPUTargetTransformInfo.cpp b/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.cpp similarity index 100% rename from lib/Target/R600/AMDGPUTargetTransformInfo.cpp rename to lib/Target/AMDGPU/AMDGPUTargetTransformInfo.cpp diff --git a/lib/Target/R600/AMDGPUTargetTransformInfo.h b/lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h similarity index 100% rename from lib/Target/R600/AMDGPUTargetTransformInfo.h rename to lib/Target/AMDGPU/AMDGPUTargetTransformInfo.h diff --git a/lib/Target/R600/AMDILCFGStructurizer.cpp b/lib/Target/AMDGPU/AMDILCFGStructurizer.cpp similarity index 100% rename from lib/Target/R600/AMDILCFGStructurizer.cpp rename to lib/Target/AMDGPU/AMDILCFGStructurizer.cpp diff --git a/lib/Target/R600/AMDKernelCodeT.h b/lib/Target/AMDGPU/AMDKernelCodeT.h similarity index 100% rename from lib/Target/R600/AMDKernelCodeT.h rename to lib/Target/AMDGPU/AMDKernelCodeT.h diff --git a/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp b/lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp similarity index 99% rename from lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp rename to lib/Target/AMDGPU/AsmParser/AMDGPUAsmParser.cpp index 02a63604970..0c9a68804a3 100644 --- a/lib/Target/R600/AsmParser/AMDGPUAsmParser.cpp +++ b/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 A(TheAMDGPUTarget); RegisterMCAsmParser B(TheGCNTarget); } diff --git a/lib/Target/AMDGPU/AsmParser/CMakeLists.txt b/lib/Target/AMDGPU/AsmParser/CMakeLists.txt new file mode 100644 index 00000000000..21ddc4eb83d --- /dev/null +++ b/lib/Target/AMDGPU/AsmParser/CMakeLists.txt @@ -0,0 +1,3 @@ +add_llvm_library(LLVMAMDGPUAsmParser + AMDGPUAsmParser.cpp + ) diff --git a/lib/Target/R600/MCTargetDesc/LLVMBuild.txt b/lib/Target/AMDGPU/AsmParser/LLVMBuild.txt similarity index 72% rename from lib/Target/R600/MCTargetDesc/LLVMBuild.txt rename to lib/Target/AMDGPU/AsmParser/LLVMBuild.txt index 74b8ca09ae1..63d44d1e06f 100644 --- a/lib/Target/R600/MCTargetDesc/LLVMBuild.txt +++ b/lib/Target/AMDGPU/AsmParser/LLVMBuild.txt @@ -1,4 +1,4 @@ -;===- ./lib/Target/R600/MCTargetDesc/LLVMBuild.txt -------------*- Conf -*--===; +;===- ./lib/Target/AMDGPU/AsmParser/LLVMBuild.txt -------------*- Conf -*--===; ; ; The LLVM Compiler Infrastructure ; @@ -17,7 +17,7 @@ [component_0] type = Library -name = R600Desc -parent = R600 -required_libraries = MC R600AsmPrinter R600Info Support -add_to_library_groups = R600 +name = AMDGPUAsmParser +parent = AMDGPU +required_libraries = MC MCParser AMDGPUDesc AMDGPUInfo Support +add_to_library_groups = AMDGPU diff --git a/lib/Target/R600/AsmParser/Makefile b/lib/Target/AMDGPU/AsmParser/Makefile similarity index 100% rename from lib/Target/R600/AsmParser/Makefile rename to lib/Target/AMDGPU/AsmParser/Makefile diff --git a/lib/Target/R600/CIInstructions.td b/lib/Target/AMDGPU/CIInstructions.td similarity index 100% rename from lib/Target/R600/CIInstructions.td rename to lib/Target/AMDGPU/CIInstructions.td diff --git a/lib/Target/R600/CMakeLists.txt b/lib/Target/AMDGPU/CMakeLists.txt similarity index 98% rename from lib/Target/R600/CMakeLists.txt rename to lib/Target/AMDGPU/CMakeLists.txt index 3c1bc49f282..3e5ff1f3c6d 100644 --- a/lib/Target/R600/CMakeLists.txt +++ b/lib/Target/AMDGPU/CMakeLists.txt @@ -12,7 +12,7 @@ tablegen(LLVM AMDGPUGenAsmWriter.inc -gen-asm-writer) tablegen(LLVM AMDGPUGenAsmMatcher.inc -gen-asm-matcher) add_public_tablegen_target(AMDGPUCommonTableGen) -add_llvm_target(R600CodeGen +add_llvm_target(AMDGPUCodeGen AMDILCFGStructurizer.cpp AMDGPUAlwaysInlinePass.cpp AMDGPUAsmPrinter.cpp diff --git a/lib/Target/R600/CaymanInstructions.td b/lib/Target/AMDGPU/CaymanInstructions.td similarity index 100% rename from lib/Target/R600/CaymanInstructions.td rename to lib/Target/AMDGPU/CaymanInstructions.td diff --git a/lib/Target/R600/EvergreenInstructions.td b/lib/Target/AMDGPU/EvergreenInstructions.td similarity index 100% rename from lib/Target/R600/EvergreenInstructions.td rename to lib/Target/AMDGPU/EvergreenInstructions.td diff --git a/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp b/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp similarity index 100% rename from lib/Target/R600/InstPrinter/AMDGPUInstPrinter.cpp rename to lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.cpp diff --git a/lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h b/lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.h similarity index 100% rename from lib/Target/R600/InstPrinter/AMDGPUInstPrinter.h rename to lib/Target/AMDGPU/InstPrinter/AMDGPUInstPrinter.h diff --git a/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt b/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt new file mode 100644 index 00000000000..ce63bd553b9 --- /dev/null +++ b/lib/Target/AMDGPU/InstPrinter/CMakeLists.txt @@ -0,0 +1,3 @@ +add_llvm_library(LLVMAMDGPUAsmPrinter + AMDGPUInstPrinter.cpp + ) diff --git a/lib/Target/R600/InstPrinter/LLVMBuild.txt b/lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt similarity index 79% rename from lib/Target/R600/InstPrinter/LLVMBuild.txt rename to lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt index ec0be89f104..fdb43844dc6 100644 --- a/lib/Target/R600/InstPrinter/LLVMBuild.txt +++ b/lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt @@ -1,4 +1,4 @@ -;===- ./lib/Target/R600/InstPrinter/LLVMBuild.txt -----------*- Conf -*--===; +;===- ./lib/Target/AMDGPU/InstPrinter/LLVMBuild.txt -----------*- Conf -*--===; ; ; The LLVM Compiler Infrastructure ; @@ -17,8 +17,8 @@ [component_0] type = Library -name = R600AsmPrinter -parent = R600 +name = AMDGPUAsmPrinter +parent = AMDGPU required_libraries = MC Support -add_to_library_groups = R600 +add_to_library_groups = AMDGPU diff --git a/lib/Target/R600/InstPrinter/Makefile b/lib/Target/AMDGPU/InstPrinter/Makefile similarity index 100% rename from lib/Target/R600/InstPrinter/Makefile rename to lib/Target/AMDGPU/InstPrinter/Makefile diff --git a/lib/Target/R600/LLVMBuild.txt b/lib/Target/AMDGPU/LLVMBuild.txt similarity index 76% rename from lib/Target/R600/LLVMBuild.txt rename to lib/Target/AMDGPU/LLVMBuild.txt index f3f254fdcba..c6861df91ed 100644 --- a/lib/Target/R600/LLVMBuild.txt +++ b/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/lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUAsmBackend.cpp rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUAsmBackend.cpp diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUELFObjectWriter.cpp rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUELFObjectWriter.cpp diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUFixupKinds.h b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUFixupKinds.h similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUFixupKinds.h rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUFixupKinds.h diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.cpp diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.h b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.h rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCAsmInfo.h diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.cpp rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.cpp diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUMCCodeEmitter.h rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCCodeEmitter.h diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp similarity index 98% rename from lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.cpp index 02192c40f92..a7d3dd1345f 100644 --- a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.cpp +++ b/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 X(*T); diff --git a/lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h b/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h similarity index 100% rename from lib/Target/R600/MCTargetDesc/AMDGPUMCTargetDesc.h rename to lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h diff --git a/lib/Target/R600/MCTargetDesc/CMakeLists.txt b/lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt similarity index 84% rename from lib/Target/R600/MCTargetDesc/CMakeLists.txt rename to lib/Target/AMDGPU/MCTargetDesc/CMakeLists.txt index 801c9054937..151d0d5f83d 100644 --- a/lib/Target/R600/MCTargetDesc/CMakeLists.txt +++ b/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/lib/Target/R600/AsmParser/LLVMBuild.txt b/lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt similarity index 72% rename from lib/Target/R600/AsmParser/LLVMBuild.txt rename to lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt index 940e4cee6df..4217bb36297 100644 --- a/lib/Target/R600/AsmParser/LLVMBuild.txt +++ b/lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt @@ -1,4 +1,4 @@ -;===- ./lib/Target/R600/AsmParser/LLVMBuild.txt -------------*- Conf -*--===; +;===- ./lib/Target/AMDGPU/MCTargetDesc/LLVMBuild.txt -------------*- Conf -*--===; ; ; The LLVM Compiler Infrastructure ; @@ -17,7 +17,7 @@ [component_0] type = Library -name = R600AsmParser -parent = R600 -required_libraries = MC MCParser R600Desc R600Info Support -add_to_library_groups = R600 +name = AMDGPUDesc +parent = AMDGPU +required_libraries = MC AMDGPUAsmPrinter AMDGPUInfo Support +add_to_library_groups = AMDGPU diff --git a/lib/Target/R600/MCTargetDesc/Makefile b/lib/Target/AMDGPU/MCTargetDesc/Makefile similarity index 100% rename from lib/Target/R600/MCTargetDesc/Makefile rename to lib/Target/AMDGPU/MCTargetDesc/Makefile diff --git a/lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp b/lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp similarity index 100% rename from lib/Target/R600/MCTargetDesc/R600MCCodeEmitter.cpp rename to lib/Target/AMDGPU/MCTargetDesc/R600MCCodeEmitter.cpp diff --git a/lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp b/lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp similarity index 100% rename from lib/Target/R600/MCTargetDesc/SIMCCodeEmitter.cpp rename to lib/Target/AMDGPU/MCTargetDesc/SIMCCodeEmitter.cpp diff --git a/lib/Target/R600/Makefile b/lib/Target/AMDGPU/Makefile similarity index 100% rename from lib/Target/R600/Makefile rename to lib/Target/AMDGPU/Makefile diff --git a/lib/Target/R600/Processors.td b/lib/Target/AMDGPU/Processors.td similarity index 100% rename from lib/Target/R600/Processors.td rename to lib/Target/AMDGPU/Processors.td diff --git a/lib/Target/R600/R600ClauseMergePass.cpp b/lib/Target/AMDGPU/R600ClauseMergePass.cpp similarity index 100% rename from lib/Target/R600/R600ClauseMergePass.cpp rename to lib/Target/AMDGPU/R600ClauseMergePass.cpp diff --git a/lib/Target/R600/R600ControlFlowFinalizer.cpp b/lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp similarity index 100% rename from lib/Target/R600/R600ControlFlowFinalizer.cpp rename to lib/Target/AMDGPU/R600ControlFlowFinalizer.cpp diff --git a/lib/Target/R600/R600Defines.h b/lib/Target/AMDGPU/R600Defines.h similarity index 100% rename from lib/Target/R600/R600Defines.h rename to lib/Target/AMDGPU/R600Defines.h diff --git a/lib/Target/R600/R600EmitClauseMarkers.cpp b/lib/Target/AMDGPU/R600EmitClauseMarkers.cpp similarity index 100% rename from lib/Target/R600/R600EmitClauseMarkers.cpp rename to lib/Target/AMDGPU/R600EmitClauseMarkers.cpp diff --git a/lib/Target/R600/R600ExpandSpecialInstrs.cpp b/lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp similarity index 100% rename from lib/Target/R600/R600ExpandSpecialInstrs.cpp rename to lib/Target/AMDGPU/R600ExpandSpecialInstrs.cpp diff --git a/lib/Target/R600/R600ISelLowering.cpp b/lib/Target/AMDGPU/R600ISelLowering.cpp similarity index 100% rename from lib/Target/R600/R600ISelLowering.cpp rename to lib/Target/AMDGPU/R600ISelLowering.cpp diff --git a/lib/Target/R600/R600ISelLowering.h b/lib/Target/AMDGPU/R600ISelLowering.h similarity index 100% rename from lib/Target/R600/R600ISelLowering.h rename to lib/Target/AMDGPU/R600ISelLowering.h diff --git a/lib/Target/R600/R600InstrFormats.td b/lib/Target/AMDGPU/R600InstrFormats.td similarity index 100% rename from lib/Target/R600/R600InstrFormats.td rename to lib/Target/AMDGPU/R600InstrFormats.td diff --git a/lib/Target/R600/R600InstrInfo.cpp b/lib/Target/AMDGPU/R600InstrInfo.cpp similarity index 100% rename from lib/Target/R600/R600InstrInfo.cpp rename to lib/Target/AMDGPU/R600InstrInfo.cpp diff --git a/lib/Target/R600/R600InstrInfo.h b/lib/Target/AMDGPU/R600InstrInfo.h similarity index 100% rename from lib/Target/R600/R600InstrInfo.h rename to lib/Target/AMDGPU/R600InstrInfo.h diff --git a/lib/Target/R600/R600Instructions.td b/lib/Target/AMDGPU/R600Instructions.td similarity index 100% rename from lib/Target/R600/R600Instructions.td rename to lib/Target/AMDGPU/R600Instructions.td diff --git a/lib/Target/R600/R600Intrinsics.td b/lib/Target/AMDGPU/R600Intrinsics.td similarity index 100% rename from lib/Target/R600/R600Intrinsics.td rename to lib/Target/AMDGPU/R600Intrinsics.td diff --git a/lib/Target/R600/R600MachineFunctionInfo.cpp b/lib/Target/AMDGPU/R600MachineFunctionInfo.cpp similarity index 100% rename from lib/Target/R600/R600MachineFunctionInfo.cpp rename to lib/Target/AMDGPU/R600MachineFunctionInfo.cpp diff --git a/lib/Target/R600/R600MachineFunctionInfo.h b/lib/Target/AMDGPU/R600MachineFunctionInfo.h similarity index 100% rename from lib/Target/R600/R600MachineFunctionInfo.h rename to lib/Target/AMDGPU/R600MachineFunctionInfo.h diff --git a/lib/Target/R600/R600MachineScheduler.cpp b/lib/Target/AMDGPU/R600MachineScheduler.cpp similarity index 100% rename from lib/Target/R600/R600MachineScheduler.cpp rename to lib/Target/AMDGPU/R600MachineScheduler.cpp diff --git a/lib/Target/R600/R600MachineScheduler.h b/lib/Target/AMDGPU/R600MachineScheduler.h similarity index 100% rename from lib/Target/R600/R600MachineScheduler.h rename to lib/Target/AMDGPU/R600MachineScheduler.h diff --git a/lib/Target/R600/R600OptimizeVectorRegisters.cpp b/lib/Target/AMDGPU/R600OptimizeVectorRegisters.cpp similarity index 100% rename from lib/Target/R600/R600OptimizeVectorRegisters.cpp rename to lib/Target/AMDGPU/R600OptimizeVectorRegisters.cpp diff --git a/lib/Target/R600/R600Packetizer.cpp b/lib/Target/AMDGPU/R600Packetizer.cpp similarity index 100% rename from lib/Target/R600/R600Packetizer.cpp rename to lib/Target/AMDGPU/R600Packetizer.cpp diff --git a/lib/Target/R600/R600RegisterInfo.cpp b/lib/Target/AMDGPU/R600RegisterInfo.cpp similarity index 100% rename from lib/Target/R600/R600RegisterInfo.cpp rename to lib/Target/AMDGPU/R600RegisterInfo.cpp diff --git a/lib/Target/R600/R600RegisterInfo.h b/lib/Target/AMDGPU/R600RegisterInfo.h similarity index 100% rename from lib/Target/R600/R600RegisterInfo.h rename to lib/Target/AMDGPU/R600RegisterInfo.h diff --git a/lib/Target/R600/R600RegisterInfo.td b/lib/Target/AMDGPU/R600RegisterInfo.td similarity index 100% rename from lib/Target/R600/R600RegisterInfo.td rename to lib/Target/AMDGPU/R600RegisterInfo.td diff --git a/lib/Target/R600/R600Schedule.td b/lib/Target/AMDGPU/R600Schedule.td similarity index 100% rename from lib/Target/R600/R600Schedule.td rename to lib/Target/AMDGPU/R600Schedule.td diff --git a/lib/Target/R600/R600TextureIntrinsicsReplacer.cpp b/lib/Target/AMDGPU/R600TextureIntrinsicsReplacer.cpp similarity index 100% rename from lib/Target/R600/R600TextureIntrinsicsReplacer.cpp rename to lib/Target/AMDGPU/R600TextureIntrinsicsReplacer.cpp diff --git a/lib/Target/R600/R700Instructions.td b/lib/Target/AMDGPU/R700Instructions.td similarity index 100% rename from lib/Target/R600/R700Instructions.td rename to lib/Target/AMDGPU/R700Instructions.td diff --git a/lib/Target/R600/SIAnnotateControlFlow.cpp b/lib/Target/AMDGPU/SIAnnotateControlFlow.cpp similarity index 100% rename from lib/Target/R600/SIAnnotateControlFlow.cpp rename to lib/Target/AMDGPU/SIAnnotateControlFlow.cpp diff --git a/lib/Target/R600/SIDefines.h b/lib/Target/AMDGPU/SIDefines.h similarity index 100% rename from lib/Target/R600/SIDefines.h rename to lib/Target/AMDGPU/SIDefines.h diff --git a/lib/Target/R600/SIFixControlFlowLiveIntervals.cpp b/lib/Target/AMDGPU/SIFixControlFlowLiveIntervals.cpp similarity index 100% rename from lib/Target/R600/SIFixControlFlowLiveIntervals.cpp rename to lib/Target/AMDGPU/SIFixControlFlowLiveIntervals.cpp diff --git a/lib/Target/R600/SIFixSGPRCopies.cpp b/lib/Target/AMDGPU/SIFixSGPRCopies.cpp similarity index 100% rename from lib/Target/R600/SIFixSGPRCopies.cpp rename to lib/Target/AMDGPU/SIFixSGPRCopies.cpp diff --git a/lib/Target/R600/SIFixSGPRLiveRanges.cpp b/lib/Target/AMDGPU/SIFixSGPRLiveRanges.cpp similarity index 100% rename from lib/Target/R600/SIFixSGPRLiveRanges.cpp rename to lib/Target/AMDGPU/SIFixSGPRLiveRanges.cpp diff --git a/lib/Target/R600/SIFoldOperands.cpp b/lib/Target/AMDGPU/SIFoldOperands.cpp similarity index 100% rename from lib/Target/R600/SIFoldOperands.cpp rename to lib/Target/AMDGPU/SIFoldOperands.cpp diff --git a/lib/Target/R600/SIISelLowering.cpp b/lib/Target/AMDGPU/SIISelLowering.cpp similarity index 100% rename from lib/Target/R600/SIISelLowering.cpp rename to lib/Target/AMDGPU/SIISelLowering.cpp diff --git a/lib/Target/R600/SIISelLowering.h b/lib/Target/AMDGPU/SIISelLowering.h similarity index 100% rename from lib/Target/R600/SIISelLowering.h rename to lib/Target/AMDGPU/SIISelLowering.h diff --git a/lib/Target/R600/SIInsertWaits.cpp b/lib/Target/AMDGPU/SIInsertWaits.cpp similarity index 100% rename from lib/Target/R600/SIInsertWaits.cpp rename to lib/Target/AMDGPU/SIInsertWaits.cpp diff --git a/lib/Target/R600/SIInstrFormats.td b/lib/Target/AMDGPU/SIInstrFormats.td similarity index 100% rename from lib/Target/R600/SIInstrFormats.td rename to lib/Target/AMDGPU/SIInstrFormats.td diff --git a/lib/Target/R600/SIInstrInfo.cpp b/lib/Target/AMDGPU/SIInstrInfo.cpp similarity index 100% rename from lib/Target/R600/SIInstrInfo.cpp rename to lib/Target/AMDGPU/SIInstrInfo.cpp diff --git a/lib/Target/R600/SIInstrInfo.h b/lib/Target/AMDGPU/SIInstrInfo.h similarity index 100% rename from lib/Target/R600/SIInstrInfo.h rename to lib/Target/AMDGPU/SIInstrInfo.h diff --git a/lib/Target/R600/SIInstrInfo.td b/lib/Target/AMDGPU/SIInstrInfo.td similarity index 100% rename from lib/Target/R600/SIInstrInfo.td rename to lib/Target/AMDGPU/SIInstrInfo.td diff --git a/lib/Target/R600/SIInstructions.td b/lib/Target/AMDGPU/SIInstructions.td similarity index 100% rename from lib/Target/R600/SIInstructions.td rename to lib/Target/AMDGPU/SIInstructions.td diff --git a/lib/Target/R600/SIIntrinsics.td b/lib/Target/AMDGPU/SIIntrinsics.td similarity index 100% rename from lib/Target/R600/SIIntrinsics.td rename to lib/Target/AMDGPU/SIIntrinsics.td diff --git a/lib/Target/R600/SILoadStoreOptimizer.cpp b/lib/Target/AMDGPU/SILoadStoreOptimizer.cpp similarity index 100% rename from lib/Target/R600/SILoadStoreOptimizer.cpp rename to lib/Target/AMDGPU/SILoadStoreOptimizer.cpp diff --git a/lib/Target/R600/SILowerControlFlow.cpp b/lib/Target/AMDGPU/SILowerControlFlow.cpp similarity index 100% rename from lib/Target/R600/SILowerControlFlow.cpp rename to lib/Target/AMDGPU/SILowerControlFlow.cpp diff --git a/lib/Target/R600/SILowerI1Copies.cpp b/lib/Target/AMDGPU/SILowerI1Copies.cpp similarity index 100% rename from lib/Target/R600/SILowerI1Copies.cpp rename to lib/Target/AMDGPU/SILowerI1Copies.cpp diff --git a/lib/Target/R600/SIMachineFunctionInfo.cpp b/lib/Target/AMDGPU/SIMachineFunctionInfo.cpp similarity index 100% rename from lib/Target/R600/SIMachineFunctionInfo.cpp rename to lib/Target/AMDGPU/SIMachineFunctionInfo.cpp diff --git a/lib/Target/R600/SIMachineFunctionInfo.h b/lib/Target/AMDGPU/SIMachineFunctionInfo.h similarity index 100% rename from lib/Target/R600/SIMachineFunctionInfo.h rename to lib/Target/AMDGPU/SIMachineFunctionInfo.h diff --git a/lib/Target/R600/SIPrepareScratchRegs.cpp b/lib/Target/AMDGPU/SIPrepareScratchRegs.cpp similarity index 100% rename from lib/Target/R600/SIPrepareScratchRegs.cpp rename to lib/Target/AMDGPU/SIPrepareScratchRegs.cpp diff --git a/lib/Target/R600/SIRegisterInfo.cpp b/lib/Target/AMDGPU/SIRegisterInfo.cpp similarity index 100% rename from lib/Target/R600/SIRegisterInfo.cpp rename to lib/Target/AMDGPU/SIRegisterInfo.cpp diff --git a/lib/Target/R600/SIRegisterInfo.h b/lib/Target/AMDGPU/SIRegisterInfo.h similarity index 100% rename from lib/Target/R600/SIRegisterInfo.h rename to lib/Target/AMDGPU/SIRegisterInfo.h diff --git a/lib/Target/R600/SIRegisterInfo.td b/lib/Target/AMDGPU/SIRegisterInfo.td similarity index 100% rename from lib/Target/R600/SIRegisterInfo.td rename to lib/Target/AMDGPU/SIRegisterInfo.td diff --git a/lib/Target/R600/SISchedule.td b/lib/Target/AMDGPU/SISchedule.td similarity index 100% rename from lib/Target/R600/SISchedule.td rename to lib/Target/AMDGPU/SISchedule.td diff --git a/lib/Target/R600/SIShrinkInstructions.cpp b/lib/Target/AMDGPU/SIShrinkInstructions.cpp similarity index 100% rename from lib/Target/R600/SIShrinkInstructions.cpp rename to lib/Target/AMDGPU/SIShrinkInstructions.cpp diff --git a/lib/Target/R600/SITypeRewriter.cpp b/lib/Target/AMDGPU/SITypeRewriter.cpp similarity index 100% rename from lib/Target/R600/SITypeRewriter.cpp rename to lib/Target/AMDGPU/SITypeRewriter.cpp diff --git a/lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp b/lib/Target/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp similarity index 95% rename from lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp rename to lib/Target/AMDGPU/TargetInfo/AMDGPUTargetInfo.cpp index d723d6e3e8b..2112135aa5d 100644 --- a/lib/Target/R600/TargetInfo/AMDGPUTargetInfo.cpp +++ b/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 R600(TheAMDGPUTarget, "r600", "AMD GPUs HD2XXX-HD6XXX"); RegisterTarget GCN(TheGCNTarget, "amdgcn", "AMD GCN GPUs"); diff --git a/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt b/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt new file mode 100644 index 00000000000..961dc550900 --- /dev/null +++ b/lib/Target/AMDGPU/TargetInfo/CMakeLists.txt @@ -0,0 +1,3 @@ +add_llvm_library(LLVMAMDGPUInfo + AMDGPUTargetInfo.cpp + ) diff --git a/lib/Target/R600/TargetInfo/LLVMBuild.txt b/lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt similarity index 79% rename from lib/Target/R600/TargetInfo/LLVMBuild.txt rename to lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt index c3d3cf51cc8..291317fa072 100644 --- a/lib/Target/R600/TargetInfo/LLVMBuild.txt +++ b/lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt @@ -1,4 +1,4 @@ -;===- ./lib/Target/R600/TargetInfo/LLVMBuild.txt --------------*- Conf -*--===; +;===- ./lib/Target/AMDGPU/TargetInfo/LLVMBuild.txt --------------*- Conf -*--===; ; ; The LLVM Compiler Infrastructure ; @@ -17,7 +17,7 @@ [component_0] type = Library -name = R600Info -parent = R600 +name = AMDGPUInfo +parent = AMDGPU required_libraries = Support -add_to_library_groups = R600 +add_to_library_groups = AMDGPU diff --git a/lib/Target/R600/TargetInfo/Makefile b/lib/Target/AMDGPU/TargetInfo/Makefile similarity index 100% rename from lib/Target/R600/TargetInfo/Makefile rename to lib/Target/AMDGPU/TargetInfo/Makefile diff --git a/lib/Target/R600/VIInstrFormats.td b/lib/Target/AMDGPU/VIInstrFormats.td similarity index 100% rename from lib/Target/R600/VIInstrFormats.td rename to lib/Target/AMDGPU/VIInstrFormats.td diff --git a/lib/Target/R600/VIInstructions.td b/lib/Target/AMDGPU/VIInstructions.td similarity index 100% rename from lib/Target/R600/VIInstructions.td rename to lib/Target/AMDGPU/VIInstructions.td diff --git a/lib/Target/LLVMBuild.txt b/lib/Target/LLVMBuild.txt index 3af3426b94c..ab823248928 100644 --- a/lib/Target/LLVMBuild.txt +++ b/lib/Target/LLVMBuild.txt @@ -19,6 +19,7 @@ ; will typically require only insertion of a line. [common] subdirectories = + AMDGPU ARM AArch64 BPF @@ -28,7 +29,6 @@ subdirectories = NVPTX Mips PowerPC - R600 Sparc SystemZ X86 diff --git a/lib/Target/R600/AsmParser/CMakeLists.txt b/lib/Target/R600/AsmParser/CMakeLists.txt deleted file mode 100644 index 1b42af73740..00000000000 --- a/lib/Target/R600/AsmParser/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMR600AsmParser - AMDGPUAsmParser.cpp - ) diff --git a/lib/Target/R600/InstPrinter/CMakeLists.txt b/lib/Target/R600/InstPrinter/CMakeLists.txt deleted file mode 100644 index dcd87037fab..00000000000 --- a/lib/Target/R600/InstPrinter/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMR600AsmPrinter - AMDGPUInstPrinter.cpp - ) diff --git a/lib/Target/R600/TargetInfo/CMakeLists.txt b/lib/Target/R600/TargetInfo/CMakeLists.txt deleted file mode 100644 index c3bd26c7a89..00000000000 --- a/lib/Target/R600/TargetInfo/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -add_llvm_library(LLVMR600Info - AMDGPUTargetInfo.cpp - ) diff --git a/test/CodeGen/R600/32-bit-local-address-space.ll b/test/CodeGen/AMDGPU/32-bit-local-address-space.ll similarity index 100% rename from test/CodeGen/R600/32-bit-local-address-space.ll rename to test/CodeGen/AMDGPU/32-bit-local-address-space.ll diff --git a/test/CodeGen/R600/README b/test/CodeGen/AMDGPU/README similarity index 100% rename from test/CodeGen/R600/README rename to test/CodeGen/AMDGPU/README diff --git a/test/CodeGen/R600/add-debug.ll b/test/CodeGen/AMDGPU/add-debug.ll similarity index 100% rename from test/CodeGen/R600/add-debug.ll rename to test/CodeGen/AMDGPU/add-debug.ll diff --git a/test/CodeGen/R600/add.ll b/test/CodeGen/AMDGPU/add.ll similarity index 100% rename from test/CodeGen/R600/add.ll rename to test/CodeGen/AMDGPU/add.ll diff --git a/test/CodeGen/R600/add_i64.ll b/test/CodeGen/AMDGPU/add_i64.ll similarity index 100% rename from test/CodeGen/R600/add_i64.ll rename to test/CodeGen/AMDGPU/add_i64.ll diff --git a/test/CodeGen/R600/address-space.ll b/test/CodeGen/AMDGPU/address-space.ll similarity index 100% rename from test/CodeGen/R600/address-space.ll rename to test/CodeGen/AMDGPU/address-space.ll diff --git a/test/CodeGen/R600/and.ll b/test/CodeGen/AMDGPU/and.ll similarity index 100% rename from test/CodeGen/R600/and.ll rename to test/CodeGen/AMDGPU/and.ll diff --git a/test/CodeGen/R600/anyext.ll b/test/CodeGen/AMDGPU/anyext.ll similarity index 100% rename from test/CodeGen/R600/anyext.ll rename to test/CodeGen/AMDGPU/anyext.ll diff --git a/test/CodeGen/R600/array-ptr-calc-i32.ll b/test/CodeGen/AMDGPU/array-ptr-calc-i32.ll similarity index 100% rename from test/CodeGen/R600/array-ptr-calc-i32.ll rename to test/CodeGen/AMDGPU/array-ptr-calc-i32.ll diff --git a/test/CodeGen/R600/array-ptr-calc-i64.ll b/test/CodeGen/AMDGPU/array-ptr-calc-i64.ll similarity index 100% rename from test/CodeGen/R600/array-ptr-calc-i64.ll rename to test/CodeGen/AMDGPU/array-ptr-calc-i64.ll diff --git a/test/CodeGen/R600/atomic_cmp_swap_local.ll b/test/CodeGen/AMDGPU/atomic_cmp_swap_local.ll similarity index 100% rename from test/CodeGen/R600/atomic_cmp_swap_local.ll rename to test/CodeGen/AMDGPU/atomic_cmp_swap_local.ll diff --git a/test/CodeGen/R600/atomic_load_add.ll b/test/CodeGen/AMDGPU/atomic_load_add.ll similarity index 100% rename from test/CodeGen/R600/atomic_load_add.ll rename to test/CodeGen/AMDGPU/atomic_load_add.ll diff --git a/test/CodeGen/R600/atomic_load_sub.ll b/test/CodeGen/AMDGPU/atomic_load_sub.ll similarity index 100% rename from test/CodeGen/R600/atomic_load_sub.ll rename to test/CodeGen/AMDGPU/atomic_load_sub.ll diff --git a/test/CodeGen/R600/basic-branch.ll b/test/CodeGen/AMDGPU/basic-branch.ll similarity index 100% rename from test/CodeGen/R600/basic-branch.ll rename to test/CodeGen/AMDGPU/basic-branch.ll diff --git a/test/CodeGen/R600/basic-loop.ll b/test/CodeGen/AMDGPU/basic-loop.ll similarity index 100% rename from test/CodeGen/R600/basic-loop.ll rename to test/CodeGen/AMDGPU/basic-loop.ll diff --git a/test/CodeGen/R600/bfe_uint.ll b/test/CodeGen/AMDGPU/bfe_uint.ll similarity index 100% rename from test/CodeGen/R600/bfe_uint.ll rename to test/CodeGen/AMDGPU/bfe_uint.ll diff --git a/test/CodeGen/R600/bfi_int.ll b/test/CodeGen/AMDGPU/bfi_int.ll similarity index 100% rename from test/CodeGen/R600/bfi_int.ll rename to test/CodeGen/AMDGPU/bfi_int.ll diff --git a/test/CodeGen/R600/big_alu.ll b/test/CodeGen/AMDGPU/big_alu.ll similarity index 100% rename from test/CodeGen/R600/big_alu.ll rename to test/CodeGen/AMDGPU/big_alu.ll diff --git a/test/CodeGen/R600/bitcast.ll b/test/CodeGen/AMDGPU/bitcast.ll similarity index 100% rename from test/CodeGen/R600/bitcast.ll rename to test/CodeGen/AMDGPU/bitcast.ll diff --git a/test/CodeGen/R600/bswap.ll b/test/CodeGen/AMDGPU/bswap.ll similarity index 100% rename from test/CodeGen/R600/bswap.ll rename to test/CodeGen/AMDGPU/bswap.ll diff --git a/test/CodeGen/R600/build_vector.ll b/test/CodeGen/AMDGPU/build_vector.ll similarity index 100% rename from test/CodeGen/R600/build_vector.ll rename to test/CodeGen/AMDGPU/build_vector.ll diff --git a/test/CodeGen/R600/call.ll b/test/CodeGen/AMDGPU/call.ll similarity index 100% rename from test/CodeGen/R600/call.ll rename to test/CodeGen/AMDGPU/call.ll diff --git a/test/CodeGen/R600/call_fs.ll b/test/CodeGen/AMDGPU/call_fs.ll similarity index 100% rename from test/CodeGen/R600/call_fs.ll rename to test/CodeGen/AMDGPU/call_fs.ll diff --git a/test/CodeGen/R600/cayman-loop-bug.ll b/test/CodeGen/AMDGPU/cayman-loop-bug.ll similarity index 100% rename from test/CodeGen/R600/cayman-loop-bug.ll rename to test/CodeGen/AMDGPU/cayman-loop-bug.ll diff --git a/test/CodeGen/R600/cf-stack-bug.ll b/test/CodeGen/AMDGPU/cf-stack-bug.ll similarity index 100% rename from test/CodeGen/R600/cf-stack-bug.ll rename to test/CodeGen/AMDGPU/cf-stack-bug.ll diff --git a/test/CodeGen/R600/cf_end.ll b/test/CodeGen/AMDGPU/cf_end.ll similarity index 100% rename from test/CodeGen/R600/cf_end.ll rename to test/CodeGen/AMDGPU/cf_end.ll diff --git a/test/CodeGen/R600/cgp-addressing-modes.ll b/test/CodeGen/AMDGPU/cgp-addressing-modes.ll similarity index 100% rename from test/CodeGen/R600/cgp-addressing-modes.ll rename to test/CodeGen/AMDGPU/cgp-addressing-modes.ll diff --git a/test/CodeGen/R600/coalescer_remat.ll b/test/CodeGen/AMDGPU/coalescer_remat.ll similarity index 100% rename from test/CodeGen/R600/coalescer_remat.ll rename to test/CodeGen/AMDGPU/coalescer_remat.ll diff --git a/test/CodeGen/R600/codegen-prepare-addrmode-sext.ll b/test/CodeGen/AMDGPU/codegen-prepare-addrmode-sext.ll similarity index 100% rename from test/CodeGen/R600/codegen-prepare-addrmode-sext.ll rename to test/CodeGen/AMDGPU/codegen-prepare-addrmode-sext.ll diff --git a/test/CodeGen/R600/combine_vloads.ll b/test/CodeGen/AMDGPU/combine_vloads.ll similarity index 100% rename from test/CodeGen/R600/combine_vloads.ll rename to test/CodeGen/AMDGPU/combine_vloads.ll diff --git a/test/CodeGen/R600/commute-compares.ll b/test/CodeGen/AMDGPU/commute-compares.ll similarity index 100% rename from test/CodeGen/R600/commute-compares.ll rename to test/CodeGen/AMDGPU/commute-compares.ll diff --git a/test/CodeGen/R600/commute_modifiers.ll b/test/CodeGen/AMDGPU/commute_modifiers.ll similarity index 100% rename from test/CodeGen/R600/commute_modifiers.ll rename to test/CodeGen/AMDGPU/commute_modifiers.ll diff --git a/test/CodeGen/R600/complex-folding.ll b/test/CodeGen/AMDGPU/complex-folding.ll similarity index 100% rename from test/CodeGen/R600/complex-folding.ll rename to test/CodeGen/AMDGPU/complex-folding.ll diff --git a/test/CodeGen/R600/concat_vectors.ll b/test/CodeGen/AMDGPU/concat_vectors.ll similarity index 100% rename from test/CodeGen/R600/concat_vectors.ll rename to test/CodeGen/AMDGPU/concat_vectors.ll diff --git a/test/CodeGen/R600/copy-illegal-type.ll b/test/CodeGen/AMDGPU/copy-illegal-type.ll similarity index 100% rename from test/CodeGen/R600/copy-illegal-type.ll rename to test/CodeGen/AMDGPU/copy-illegal-type.ll diff --git a/test/CodeGen/R600/copy-to-reg.ll b/test/CodeGen/AMDGPU/copy-to-reg.ll similarity index 100% rename from test/CodeGen/R600/copy-to-reg.ll rename to test/CodeGen/AMDGPU/copy-to-reg.ll diff --git a/test/CodeGen/R600/ctlz_zero_undef.ll b/test/CodeGen/AMDGPU/ctlz_zero_undef.ll similarity index 100% rename from test/CodeGen/R600/ctlz_zero_undef.ll rename to test/CodeGen/AMDGPU/ctlz_zero_undef.ll diff --git a/test/CodeGen/R600/ctpop.ll b/test/CodeGen/AMDGPU/ctpop.ll similarity index 100% rename from test/CodeGen/R600/ctpop.ll rename to test/CodeGen/AMDGPU/ctpop.ll diff --git a/test/CodeGen/R600/ctpop64.ll b/test/CodeGen/AMDGPU/ctpop64.ll similarity index 100% rename from test/CodeGen/R600/ctpop64.ll rename to test/CodeGen/AMDGPU/ctpop64.ll diff --git a/test/CodeGen/R600/cttz_zero_undef.ll b/test/CodeGen/AMDGPU/cttz_zero_undef.ll similarity index 100% rename from test/CodeGen/R600/cttz_zero_undef.ll rename to test/CodeGen/AMDGPU/cttz_zero_undef.ll diff --git a/test/CodeGen/R600/cvt_f32_ubyte.ll b/test/CodeGen/AMDGPU/cvt_f32_ubyte.ll similarity index 100% rename from test/CodeGen/R600/cvt_f32_ubyte.ll rename to test/CodeGen/AMDGPU/cvt_f32_ubyte.ll diff --git a/test/CodeGen/R600/cvt_flr_i32_f32.ll b/test/CodeGen/AMDGPU/cvt_flr_i32_f32.ll similarity index 100% rename from test/CodeGen/R600/cvt_flr_i32_f32.ll rename to test/CodeGen/AMDGPU/cvt_flr_i32_f32.ll diff --git a/test/CodeGen/R600/cvt_rpi_i32_f32.ll b/test/CodeGen/AMDGPU/cvt_rpi_i32_f32.ll similarity index 100% rename from test/CodeGen/R600/cvt_rpi_i32_f32.ll rename to test/CodeGen/AMDGPU/cvt_rpi_i32_f32.ll diff --git a/test/CodeGen/R600/dagcombiner-bug-illegal-vec4-int-to-fp.ll b/test/CodeGen/AMDGPU/dagcombiner-bug-illegal-vec4-int-to-fp.ll similarity index 100% rename from test/CodeGen/R600/dagcombiner-bug-illegal-vec4-int-to-fp.ll rename to test/CodeGen/AMDGPU/dagcombiner-bug-illegal-vec4-int-to-fp.ll diff --git a/test/CodeGen/R600/debug.ll b/test/CodeGen/AMDGPU/debug.ll similarity index 100% rename from test/CodeGen/R600/debug.ll rename to test/CodeGen/AMDGPU/debug.ll diff --git a/test/CodeGen/R600/default-fp-mode.ll b/test/CodeGen/AMDGPU/default-fp-mode.ll similarity index 100% rename from test/CodeGen/R600/default-fp-mode.ll rename to test/CodeGen/AMDGPU/default-fp-mode.ll diff --git a/test/CodeGen/R600/disconnected-predset-break-bug.ll b/test/CodeGen/AMDGPU/disconnected-predset-break-bug.ll similarity index 100% rename from test/CodeGen/R600/disconnected-predset-break-bug.ll rename to test/CodeGen/AMDGPU/disconnected-predset-break-bug.ll diff --git a/test/CodeGen/R600/dot4-folding.ll b/test/CodeGen/AMDGPU/dot4-folding.ll similarity index 100% rename from test/CodeGen/R600/dot4-folding.ll rename to test/CodeGen/AMDGPU/dot4-folding.ll diff --git a/test/CodeGen/R600/ds-negative-offset-addressing-mode-loop.ll b/test/CodeGen/AMDGPU/ds-negative-offset-addressing-mode-loop.ll similarity index 100% rename from test/CodeGen/R600/ds-negative-offset-addressing-mode-loop.ll rename to test/CodeGen/AMDGPU/ds-negative-offset-addressing-mode-loop.ll diff --git a/test/CodeGen/R600/ds_read2.ll b/test/CodeGen/AMDGPU/ds_read2.ll similarity index 100% rename from test/CodeGen/R600/ds_read2.ll rename to test/CodeGen/AMDGPU/ds_read2.ll diff --git a/test/CodeGen/R600/ds_read2_offset_order.ll b/test/CodeGen/AMDGPU/ds_read2_offset_order.ll similarity index 100% rename from test/CodeGen/R600/ds_read2_offset_order.ll rename to test/CodeGen/AMDGPU/ds_read2_offset_order.ll diff --git a/test/CodeGen/R600/ds_read2st64.ll b/test/CodeGen/AMDGPU/ds_read2st64.ll similarity index 100% rename from test/CodeGen/R600/ds_read2st64.ll rename to test/CodeGen/AMDGPU/ds_read2st64.ll diff --git a/test/CodeGen/R600/ds_write2.ll b/test/CodeGen/AMDGPU/ds_write2.ll similarity index 100% rename from test/CodeGen/R600/ds_write2.ll rename to test/CodeGen/AMDGPU/ds_write2.ll diff --git a/test/CodeGen/R600/ds_write2st64.ll b/test/CodeGen/AMDGPU/ds_write2st64.ll similarity index 100% rename from test/CodeGen/R600/ds_write2st64.ll rename to test/CodeGen/AMDGPU/ds_write2st64.ll diff --git a/test/CodeGen/R600/elf.ll b/test/CodeGen/AMDGPU/elf.ll similarity index 100% rename from test/CodeGen/R600/elf.ll rename to test/CodeGen/AMDGPU/elf.ll diff --git a/test/CodeGen/R600/elf.r600.ll b/test/CodeGen/AMDGPU/elf.r600.ll similarity index 100% rename from test/CodeGen/R600/elf.r600.ll rename to test/CodeGen/AMDGPU/elf.r600.ll diff --git a/test/CodeGen/R600/empty-function.ll b/test/CodeGen/AMDGPU/empty-function.ll similarity index 100% rename from test/CodeGen/R600/empty-function.ll rename to test/CodeGen/AMDGPU/empty-function.ll diff --git a/test/CodeGen/R600/endcf-loop-header.ll b/test/CodeGen/AMDGPU/endcf-loop-header.ll similarity index 100% rename from test/CodeGen/R600/endcf-loop-header.ll rename to test/CodeGen/AMDGPU/endcf-loop-header.ll diff --git a/test/CodeGen/R600/extload-private.ll b/test/CodeGen/AMDGPU/extload-private.ll similarity index 100% rename from test/CodeGen/R600/extload-private.ll rename to test/CodeGen/AMDGPU/extload-private.ll diff --git a/test/CodeGen/R600/extload.ll b/test/CodeGen/AMDGPU/extload.ll similarity index 100% rename from test/CodeGen/R600/extload.ll rename to test/CodeGen/AMDGPU/extload.ll diff --git a/test/CodeGen/R600/extract_vector_elt_i16.ll b/test/CodeGen/AMDGPU/extract_vector_elt_i16.ll similarity index 100% rename from test/CodeGen/R600/extract_vector_elt_i16.ll rename to test/CodeGen/AMDGPU/extract_vector_elt_i16.ll diff --git a/test/CodeGen/R600/fabs.f64.ll b/test/CodeGen/AMDGPU/fabs.f64.ll similarity index 100% rename from test/CodeGen/R600/fabs.f64.ll rename to test/CodeGen/AMDGPU/fabs.f64.ll diff --git a/test/CodeGen/R600/fabs.ll b/test/CodeGen/AMDGPU/fabs.ll similarity index 100% rename from test/CodeGen/R600/fabs.ll rename to test/CodeGen/AMDGPU/fabs.ll diff --git a/test/CodeGen/R600/fadd.ll b/test/CodeGen/AMDGPU/fadd.ll similarity index 100% rename from test/CodeGen/R600/fadd.ll rename to test/CodeGen/AMDGPU/fadd.ll diff --git a/test/CodeGen/R600/fadd64.ll b/test/CodeGen/AMDGPU/fadd64.ll similarity index 100% rename from test/CodeGen/R600/fadd64.ll rename to test/CodeGen/AMDGPU/fadd64.ll diff --git a/test/CodeGen/R600/fceil.ll b/test/CodeGen/AMDGPU/fceil.ll similarity index 100% rename from test/CodeGen/R600/fceil.ll rename to test/CodeGen/AMDGPU/fceil.ll diff --git a/test/CodeGen/R600/fceil64.ll b/test/CodeGen/AMDGPU/fceil64.ll similarity index 100% rename from test/CodeGen/R600/fceil64.ll rename to test/CodeGen/AMDGPU/fceil64.ll diff --git a/test/CodeGen/R600/fcmp-cnd.ll b/test/CodeGen/AMDGPU/fcmp-cnd.ll similarity index 100% rename from test/CodeGen/R600/fcmp-cnd.ll rename to test/CodeGen/AMDGPU/fcmp-cnd.ll diff --git a/test/CodeGen/R600/fcmp-cnde-int-args.ll b/test/CodeGen/AMDGPU/fcmp-cnde-int-args.ll similarity index 100% rename from test/CodeGen/R600/fcmp-cnde-int-args.ll rename to test/CodeGen/AMDGPU/fcmp-cnde-int-args.ll diff --git a/test/CodeGen/R600/fcmp.ll b/test/CodeGen/AMDGPU/fcmp.ll similarity index 100% rename from test/CodeGen/R600/fcmp.ll rename to test/CodeGen/AMDGPU/fcmp.ll diff --git a/test/CodeGen/R600/fcmp64.ll b/test/CodeGen/AMDGPU/fcmp64.ll similarity index 100% rename from test/CodeGen/R600/fcmp64.ll rename to test/CodeGen/AMDGPU/fcmp64.ll diff --git a/test/CodeGen/R600/fconst64.ll b/test/CodeGen/AMDGPU/fconst64.ll similarity index 100% rename from test/CodeGen/R600/fconst64.ll rename to test/CodeGen/AMDGPU/fconst64.ll diff --git a/test/CodeGen/R600/fcopysign.f32.ll b/test/CodeGen/AMDGPU/fcopysign.f32.ll similarity index 100% rename from test/CodeGen/R600/fcopysign.f32.ll rename to test/CodeGen/AMDGPU/fcopysign.f32.ll diff --git a/test/CodeGen/R600/fcopysign.f64.ll b/test/CodeGen/AMDGPU/fcopysign.f64.ll similarity index 100% rename from test/CodeGen/R600/fcopysign.f64.ll rename to test/CodeGen/AMDGPU/fcopysign.f64.ll diff --git a/test/CodeGen/R600/fdiv.f64.ll b/test/CodeGen/AMDGPU/fdiv.f64.ll similarity index 100% rename from test/CodeGen/R600/fdiv.f64.ll rename to test/CodeGen/AMDGPU/fdiv.f64.ll diff --git a/test/CodeGen/R600/fdiv.ll b/test/CodeGen/AMDGPU/fdiv.ll similarity index 100% rename from test/CodeGen/R600/fdiv.ll rename to test/CodeGen/AMDGPU/fdiv.ll diff --git a/test/CodeGen/R600/fetch-limits.r600.ll b/test/CodeGen/AMDGPU/fetch-limits.r600.ll similarity index 100% rename from test/CodeGen/R600/fetch-limits.r600.ll rename to test/CodeGen/AMDGPU/fetch-limits.r600.ll diff --git a/test/CodeGen/R600/fetch-limits.r700+.ll b/test/CodeGen/AMDGPU/fetch-limits.r700+.ll similarity index 100% rename from test/CodeGen/R600/fetch-limits.r700+.ll rename to test/CodeGen/AMDGPU/fetch-limits.r700+.ll diff --git a/test/CodeGen/R600/ffloor.f64.ll b/test/CodeGen/AMDGPU/ffloor.f64.ll similarity index 100% rename from test/CodeGen/R600/ffloor.f64.ll rename to test/CodeGen/AMDGPU/ffloor.f64.ll diff --git a/test/CodeGen/R600/ffloor.ll b/test/CodeGen/AMDGPU/ffloor.ll similarity index 100% rename from test/CodeGen/R600/ffloor.ll rename to test/CodeGen/AMDGPU/ffloor.ll diff --git a/test/CodeGen/R600/flat-address-space.ll b/test/CodeGen/AMDGPU/flat-address-space.ll similarity index 100% rename from test/CodeGen/R600/flat-address-space.ll rename to test/CodeGen/AMDGPU/flat-address-space.ll diff --git a/test/CodeGen/R600/floor.ll b/test/CodeGen/AMDGPU/floor.ll similarity index 100% rename from test/CodeGen/R600/floor.ll rename to test/CodeGen/AMDGPU/floor.ll diff --git a/test/CodeGen/R600/fma-combine.ll b/test/CodeGen/AMDGPU/fma-combine.ll similarity index 100% rename from test/CodeGen/R600/fma-combine.ll rename to test/CodeGen/AMDGPU/fma-combine.ll diff --git a/test/CodeGen/R600/fma.f64.ll b/test/CodeGen/AMDGPU/fma.f64.ll similarity index 100% rename from test/CodeGen/R600/fma.f64.ll rename to test/CodeGen/AMDGPU/fma.f64.ll diff --git a/test/CodeGen/R600/fma.ll b/test/CodeGen/AMDGPU/fma.ll similarity index 100% rename from test/CodeGen/R600/fma.ll rename to test/CodeGen/AMDGPU/fma.ll diff --git a/test/CodeGen/R600/fmad.ll b/test/CodeGen/AMDGPU/fmad.ll similarity index 100% rename from test/CodeGen/R600/fmad.ll rename to test/CodeGen/AMDGPU/fmad.ll diff --git a/test/CodeGen/R600/fmax.ll b/test/CodeGen/AMDGPU/fmax.ll similarity index 100% rename from test/CodeGen/R600/fmax.ll rename to test/CodeGen/AMDGPU/fmax.ll diff --git a/test/CodeGen/R600/fmax3.f64.ll b/test/CodeGen/AMDGPU/fmax3.f64.ll similarity index 100% rename from test/CodeGen/R600/fmax3.f64.ll rename to test/CodeGen/AMDGPU/fmax3.f64.ll diff --git a/test/CodeGen/R600/fmax3.ll b/test/CodeGen/AMDGPU/fmax3.ll similarity index 100% rename from test/CodeGen/R600/fmax3.ll rename to test/CodeGen/AMDGPU/fmax3.ll diff --git a/test/CodeGen/R600/fmax_legacy.f64.ll b/test/CodeGen/AMDGPU/fmax_legacy.f64.ll similarity index 100% rename from test/CodeGen/R600/fmax_legacy.f64.ll rename to test/CodeGen/AMDGPU/fmax_legacy.f64.ll diff --git a/test/CodeGen/R600/fmax_legacy.ll b/test/CodeGen/AMDGPU/fmax_legacy.ll similarity index 100% rename from test/CodeGen/R600/fmax_legacy.ll rename to test/CodeGen/AMDGPU/fmax_legacy.ll diff --git a/test/CodeGen/R600/fmaxnum.f64.ll b/test/CodeGen/AMDGPU/fmaxnum.f64.ll similarity index 100% rename from test/CodeGen/R600/fmaxnum.f64.ll rename to test/CodeGen/AMDGPU/fmaxnum.f64.ll diff --git a/test/CodeGen/R600/fmaxnum.ll b/test/CodeGen/AMDGPU/fmaxnum.ll similarity index 100% rename from test/CodeGen/R600/fmaxnum.ll rename to test/CodeGen/AMDGPU/fmaxnum.ll diff --git a/test/CodeGen/R600/fmin.ll b/test/CodeGen/AMDGPU/fmin.ll similarity index 100% rename from test/CodeGen/R600/fmin.ll rename to test/CodeGen/AMDGPU/fmin.ll diff --git a/test/CodeGen/R600/fmin3.ll b/test/CodeGen/AMDGPU/fmin3.ll similarity index 100% rename from test/CodeGen/R600/fmin3.ll rename to test/CodeGen/AMDGPU/fmin3.ll diff --git a/test/CodeGen/R600/fmin_legacy.f64.ll b/test/CodeGen/AMDGPU/fmin_legacy.f64.ll similarity index 100% rename from test/CodeGen/R600/fmin_legacy.f64.ll rename to test/CodeGen/AMDGPU/fmin_legacy.f64.ll diff --git a/test/CodeGen/R600/fmin_legacy.ll b/test/CodeGen/AMDGPU/fmin_legacy.ll similarity index 100% rename from test/CodeGen/R600/fmin_legacy.ll rename to test/CodeGen/AMDGPU/fmin_legacy.ll diff --git a/test/CodeGen/R600/fminnum.f64.ll b/test/CodeGen/AMDGPU/fminnum.f64.ll similarity index 100% rename from test/CodeGen/R600/fminnum.f64.ll rename to test/CodeGen/AMDGPU/fminnum.f64.ll diff --git a/test/CodeGen/R600/fminnum.ll b/test/CodeGen/AMDGPU/fminnum.ll similarity index 100% rename from test/CodeGen/R600/fminnum.ll rename to test/CodeGen/AMDGPU/fminnum.ll diff --git a/test/CodeGen/R600/fmul.ll b/test/CodeGen/AMDGPU/fmul.ll similarity index 100% rename from test/CodeGen/R600/fmul.ll rename to test/CodeGen/AMDGPU/fmul.ll diff --git a/test/CodeGen/R600/fmul64.ll b/test/CodeGen/AMDGPU/fmul64.ll similarity index 100% rename from test/CodeGen/R600/fmul64.ll rename to test/CodeGen/AMDGPU/fmul64.ll diff --git a/test/CodeGen/R600/fmuladd.ll b/test/CodeGen/AMDGPU/fmuladd.ll similarity index 100% rename from test/CodeGen/R600/fmuladd.ll rename to test/CodeGen/AMDGPU/fmuladd.ll diff --git a/test/CodeGen/R600/fnearbyint.ll b/test/CodeGen/AMDGPU/fnearbyint.ll similarity index 100% rename from test/CodeGen/R600/fnearbyint.ll rename to test/CodeGen/AMDGPU/fnearbyint.ll diff --git a/test/CodeGen/R600/fneg-fabs.f64.ll b/test/CodeGen/AMDGPU/fneg-fabs.f64.ll similarity index 100% rename from test/CodeGen/R600/fneg-fabs.f64.ll rename to test/CodeGen/AMDGPU/fneg-fabs.f64.ll diff --git a/test/CodeGen/R600/fneg-fabs.ll b/test/CodeGen/AMDGPU/fneg-fabs.ll similarity index 100% rename from test/CodeGen/R600/fneg-fabs.ll rename to test/CodeGen/AMDGPU/fneg-fabs.ll diff --git a/test/CodeGen/R600/fneg.f64.ll b/test/CodeGen/AMDGPU/fneg.f64.ll similarity index 100% rename from test/CodeGen/R600/fneg.f64.ll rename to test/CodeGen/AMDGPU/fneg.f64.ll diff --git a/test/CodeGen/R600/fneg.ll b/test/CodeGen/AMDGPU/fneg.ll similarity index 100% rename from test/CodeGen/R600/fneg.ll rename to test/CodeGen/AMDGPU/fneg.ll diff --git a/test/CodeGen/R600/fp-classify.ll b/test/CodeGen/AMDGPU/fp-classify.ll similarity index 100% rename from test/CodeGen/R600/fp-classify.ll rename to test/CodeGen/AMDGPU/fp-classify.ll diff --git a/test/CodeGen/R600/fp16_to_fp.ll b/test/CodeGen/AMDGPU/fp16_to_fp.ll similarity index 100% rename from test/CodeGen/R600/fp16_to_fp.ll rename to test/CodeGen/AMDGPU/fp16_to_fp.ll diff --git a/test/CodeGen/R600/fp32_to_fp16.ll b/test/CodeGen/AMDGPU/fp32_to_fp16.ll similarity index 100% rename from test/CodeGen/R600/fp32_to_fp16.ll rename to test/CodeGen/AMDGPU/fp32_to_fp16.ll diff --git a/test/CodeGen/R600/fp_to_sint.f64.ll b/test/CodeGen/AMDGPU/fp_to_sint.f64.ll similarity index 100% rename from test/CodeGen/R600/fp_to_sint.f64.ll rename to test/CodeGen/AMDGPU/fp_to_sint.f64.ll diff --git a/test/CodeGen/R600/fp_to_sint.ll b/test/CodeGen/AMDGPU/fp_to_sint.ll similarity index 100% rename from test/CodeGen/R600/fp_to_sint.ll rename to test/CodeGen/AMDGPU/fp_to_sint.ll diff --git a/test/CodeGen/R600/fp_to_uint.f64.ll b/test/CodeGen/AMDGPU/fp_to_uint.f64.ll similarity index 100% rename from test/CodeGen/R600/fp_to_uint.f64.ll rename to test/CodeGen/AMDGPU/fp_to_uint.f64.ll diff --git a/test/CodeGen/R600/fp_to_uint.ll b/test/CodeGen/AMDGPU/fp_to_uint.ll similarity index 100% rename from test/CodeGen/R600/fp_to_uint.ll rename to test/CodeGen/AMDGPU/fp_to_uint.ll diff --git a/test/CodeGen/R600/fpext.ll b/test/CodeGen/AMDGPU/fpext.ll similarity index 100% rename from test/CodeGen/R600/fpext.ll rename to test/CodeGen/AMDGPU/fpext.ll diff --git a/test/CodeGen/R600/fptrunc.ll b/test/CodeGen/AMDGPU/fptrunc.ll similarity index 100% rename from test/CodeGen/R600/fptrunc.ll rename to test/CodeGen/AMDGPU/fptrunc.ll diff --git a/test/CodeGen/R600/frem.ll b/test/CodeGen/AMDGPU/frem.ll similarity index 100% rename from test/CodeGen/R600/frem.ll rename to test/CodeGen/AMDGPU/frem.ll diff --git a/test/CodeGen/R600/fsqrt.ll b/test/CodeGen/AMDGPU/fsqrt.ll similarity index 100% rename from test/CodeGen/R600/fsqrt.ll rename to test/CodeGen/AMDGPU/fsqrt.ll diff --git a/test/CodeGen/R600/fsub.ll b/test/CodeGen/AMDGPU/fsub.ll similarity index 100% rename from test/CodeGen/R600/fsub.ll rename to test/CodeGen/AMDGPU/fsub.ll diff --git a/test/CodeGen/R600/fsub64.ll b/test/CodeGen/AMDGPU/fsub64.ll similarity index 100% rename from test/CodeGen/R600/fsub64.ll rename to test/CodeGen/AMDGPU/fsub64.ll diff --git a/test/CodeGen/R600/ftrunc.f64.ll b/test/CodeGen/AMDGPU/ftrunc.f64.ll similarity index 100% rename from test/CodeGen/R600/ftrunc.f64.ll rename to test/CodeGen/AMDGPU/ftrunc.f64.ll diff --git a/test/CodeGen/R600/ftrunc.ll b/test/CodeGen/AMDGPU/ftrunc.ll similarity index 100% rename from test/CodeGen/R600/ftrunc.ll rename to test/CodeGen/AMDGPU/ftrunc.ll diff --git a/test/CodeGen/R600/gep-address-space.ll b/test/CodeGen/AMDGPU/gep-address-space.ll similarity index 100% rename from test/CodeGen/R600/gep-address-space.ll rename to test/CodeGen/AMDGPU/gep-address-space.ll diff --git a/test/CodeGen/R600/global-directive.ll b/test/CodeGen/AMDGPU/global-directive.ll similarity index 100% rename from test/CodeGen/R600/global-directive.ll rename to test/CodeGen/AMDGPU/global-directive.ll diff --git a/test/CodeGen/R600/global-extload-i1.ll b/test/CodeGen/AMDGPU/global-extload-i1.ll similarity index 100% rename from test/CodeGen/R600/global-extload-i1.ll rename to test/CodeGen/AMDGPU/global-extload-i1.ll diff --git a/test/CodeGen/R600/global-extload-i16.ll b/test/CodeGen/AMDGPU/global-extload-i16.ll similarity index 100% rename from test/CodeGen/R600/global-extload-i16.ll rename to test/CodeGen/AMDGPU/global-extload-i16.ll diff --git a/test/CodeGen/R600/global-extload-i32.ll b/test/CodeGen/AMDGPU/global-extload-i32.ll similarity index 100% rename from test/CodeGen/R600/global-extload-i32.ll rename to test/CodeGen/AMDGPU/global-extload-i32.ll diff --git a/test/CodeGen/R600/global-extload-i8.ll b/test/CodeGen/AMDGPU/global-extload-i8.ll similarity index 100% rename from test/CodeGen/R600/global-extload-i8.ll rename to test/CodeGen/AMDGPU/global-extload-i8.ll diff --git a/test/CodeGen/R600/global-zero-initializer.ll b/test/CodeGen/AMDGPU/global-zero-initializer.ll similarity index 100% rename from test/CodeGen/R600/global-zero-initializer.ll rename to test/CodeGen/AMDGPU/global-zero-initializer.ll diff --git a/test/CodeGen/R600/global_atomics.ll b/test/CodeGen/AMDGPU/global_atomics.ll similarity index 100% rename from test/CodeGen/R600/global_atomics.ll rename to test/CodeGen/AMDGPU/global_atomics.ll diff --git a/test/CodeGen/R600/gv-const-addrspace-fail.ll b/test/CodeGen/AMDGPU/gv-const-addrspace-fail.ll similarity index 100% rename from test/CodeGen/R600/gv-const-addrspace-fail.ll rename to test/CodeGen/AMDGPU/gv-const-addrspace-fail.ll diff --git a/test/CodeGen/R600/gv-const-addrspace.ll b/test/CodeGen/AMDGPU/gv-const-addrspace.ll similarity index 100% rename from test/CodeGen/R600/gv-const-addrspace.ll rename to test/CodeGen/AMDGPU/gv-const-addrspace.ll diff --git a/test/CodeGen/R600/half.ll b/test/CodeGen/AMDGPU/half.ll similarity index 100% rename from test/CodeGen/R600/half.ll rename to test/CodeGen/AMDGPU/half.ll diff --git a/test/CodeGen/R600/hsa.ll b/test/CodeGen/AMDGPU/hsa.ll similarity index 100% rename from test/CodeGen/R600/hsa.ll rename to test/CodeGen/AMDGPU/hsa.ll diff --git a/test/CodeGen/R600/i1-copy-implicit-def.ll b/test/CodeGen/AMDGPU/i1-copy-implicit-def.ll similarity index 100% rename from test/CodeGen/R600/i1-copy-implicit-def.ll rename to test/CodeGen/AMDGPU/i1-copy-implicit-def.ll diff --git a/test/CodeGen/R600/i1-copy-phi.ll b/test/CodeGen/AMDGPU/i1-copy-phi.ll similarity index 100% rename from test/CodeGen/R600/i1-copy-phi.ll rename to test/CodeGen/AMDGPU/i1-copy-phi.ll diff --git a/test/CodeGen/R600/i8-to-double-to-float.ll b/test/CodeGen/AMDGPU/i8-to-double-to-float.ll similarity index 100% rename from test/CodeGen/R600/i8-to-double-to-float.ll rename to test/CodeGen/AMDGPU/i8-to-double-to-float.ll diff --git a/test/CodeGen/R600/icmp-select-sete-reverse-args.ll b/test/CodeGen/AMDGPU/icmp-select-sete-reverse-args.ll similarity index 100% rename from test/CodeGen/R600/icmp-select-sete-reverse-args.ll rename to test/CodeGen/AMDGPU/icmp-select-sete-reverse-args.ll diff --git a/test/CodeGen/R600/icmp64.ll b/test/CodeGen/AMDGPU/icmp64.ll similarity index 100% rename from test/CodeGen/R600/icmp64.ll rename to test/CodeGen/AMDGPU/icmp64.ll diff --git a/test/CodeGen/R600/imm.ll b/test/CodeGen/AMDGPU/imm.ll similarity index 100% rename from test/CodeGen/R600/imm.ll rename to test/CodeGen/AMDGPU/imm.ll diff --git a/test/CodeGen/R600/indirect-addressing-si.ll b/test/CodeGen/AMDGPU/indirect-addressing-si.ll similarity index 100% rename from test/CodeGen/R600/indirect-addressing-si.ll rename to test/CodeGen/AMDGPU/indirect-addressing-si.ll diff --git a/test/CodeGen/R600/indirect-private-64.ll b/test/CodeGen/AMDGPU/indirect-private-64.ll similarity index 100% rename from test/CodeGen/R600/indirect-private-64.ll rename to test/CodeGen/AMDGPU/indirect-private-64.ll diff --git a/test/CodeGen/R600/infinite-loop-evergreen.ll b/test/CodeGen/AMDGPU/infinite-loop-evergreen.ll similarity index 100% rename from test/CodeGen/R600/infinite-loop-evergreen.ll rename to test/CodeGen/AMDGPU/infinite-loop-evergreen.ll diff --git a/test/CodeGen/R600/infinite-loop.ll b/test/CodeGen/AMDGPU/infinite-loop.ll similarity index 100% rename from test/CodeGen/R600/infinite-loop.ll rename to test/CodeGen/AMDGPU/infinite-loop.ll diff --git a/test/CodeGen/R600/inline-asm.ll b/test/CodeGen/AMDGPU/inline-asm.ll similarity index 100% rename from test/CodeGen/R600/inline-asm.ll rename to test/CodeGen/AMDGPU/inline-asm.ll diff --git a/test/CodeGen/R600/inline-calls.ll b/test/CodeGen/AMDGPU/inline-calls.ll similarity index 100% rename from test/CodeGen/R600/inline-calls.ll rename to test/CodeGen/AMDGPU/inline-calls.ll diff --git a/test/CodeGen/R600/input-mods.ll b/test/CodeGen/AMDGPU/input-mods.ll similarity index 100% rename from test/CodeGen/R600/input-mods.ll rename to test/CodeGen/AMDGPU/input-mods.ll diff --git a/test/CodeGen/R600/insert_subreg.ll b/test/CodeGen/AMDGPU/insert_subreg.ll similarity index 100% rename from test/CodeGen/R600/insert_subreg.ll rename to test/CodeGen/AMDGPU/insert_subreg.ll diff --git a/test/CodeGen/R600/insert_vector_elt.ll b/test/CodeGen/AMDGPU/insert_vector_elt.ll similarity index 100% rename from test/CodeGen/R600/insert_vector_elt.ll rename to test/CodeGen/AMDGPU/insert_vector_elt.ll diff --git a/test/CodeGen/R600/jump-address.ll b/test/CodeGen/AMDGPU/jump-address.ll similarity index 100% rename from test/CodeGen/R600/jump-address.ll rename to test/CodeGen/AMDGPU/jump-address.ll diff --git a/test/CodeGen/R600/kcache-fold.ll b/test/CodeGen/AMDGPU/kcache-fold.ll similarity index 100% rename from test/CodeGen/R600/kcache-fold.ll rename to test/CodeGen/AMDGPU/kcache-fold.ll diff --git a/test/CodeGen/R600/kernel-args.ll b/test/CodeGen/AMDGPU/kernel-args.ll similarity index 100% rename from test/CodeGen/R600/kernel-args.ll rename to test/CodeGen/AMDGPU/kernel-args.ll diff --git a/test/CodeGen/R600/large-alloca.ll b/test/CodeGen/AMDGPU/large-alloca.ll similarity index 100% rename from test/CodeGen/R600/large-alloca.ll rename to test/CodeGen/AMDGPU/large-alloca.ll diff --git a/test/CodeGen/R600/large-constant-initializer.ll b/test/CodeGen/AMDGPU/large-constant-initializer.ll similarity index 100% rename from test/CodeGen/R600/large-constant-initializer.ll rename to test/CodeGen/AMDGPU/large-constant-initializer.ll diff --git a/test/CodeGen/R600/lds-initializer.ll b/test/CodeGen/AMDGPU/lds-initializer.ll similarity index 100% rename from test/CodeGen/R600/lds-initializer.ll rename to test/CodeGen/AMDGPU/lds-initializer.ll diff --git a/test/CodeGen/R600/lds-oqap-crash.ll b/test/CodeGen/AMDGPU/lds-oqap-crash.ll similarity index 100% rename from test/CodeGen/R600/lds-oqap-crash.ll rename to test/CodeGen/AMDGPU/lds-oqap-crash.ll diff --git a/test/CodeGen/R600/lds-output-queue.ll b/test/CodeGen/AMDGPU/lds-output-queue.ll similarity index 100% rename from test/CodeGen/R600/lds-output-queue.ll rename to test/CodeGen/AMDGPU/lds-output-queue.ll diff --git a/test/CodeGen/R600/lds-size.ll b/test/CodeGen/AMDGPU/lds-size.ll similarity index 100% rename from test/CodeGen/R600/lds-size.ll rename to test/CodeGen/AMDGPU/lds-size.ll diff --git a/test/CodeGen/R600/lds-zero-initializer.ll b/test/CodeGen/AMDGPU/lds-zero-initializer.ll similarity index 100% rename from test/CodeGen/R600/lds-zero-initializer.ll rename to test/CodeGen/AMDGPU/lds-zero-initializer.ll diff --git a/test/CodeGen/R600/legalizedag-bug-expand-setcc.ll b/test/CodeGen/AMDGPU/legalizedag-bug-expand-setcc.ll similarity index 100% rename from test/CodeGen/R600/legalizedag-bug-expand-setcc.ll rename to test/CodeGen/AMDGPU/legalizedag-bug-expand-setcc.ll diff --git a/test/CodeGen/AMDGPU/lit.local.cfg b/test/CodeGen/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..2a665f06be7 --- /dev/null +++ b/test/CodeGen/AMDGPU/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True diff --git a/test/CodeGen/R600/literals.ll b/test/CodeGen/AMDGPU/literals.ll similarity index 100% rename from test/CodeGen/R600/literals.ll rename to test/CodeGen/AMDGPU/literals.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.abs.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.abs.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.abs.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.abs.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.global.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.barrier.global.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.global.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.local.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.barrier.local.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.barrier.local.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.bfe.i32.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.i32.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.bfe.i32.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.i32.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.bfe.u32.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.u32.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.bfe.u32.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.bfe.u32.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.bfi.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.bfi.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.bfi.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.bfi.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.bfm.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.bfm.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.bfm.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.bfm.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.brev.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.brev.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.brev.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.brev.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.clamp.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.clamp.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.clamp.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.clamp.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.class.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.class.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.class.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.class.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.cube.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.cube.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.cube.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.cube.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.cvt_f32_ubyte.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.cvt_f32_ubyte.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.cvt_f32_ubyte.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.cvt_f32_ubyte.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.div_fixup.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.div_fixup.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.div_fixup.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.div_fixup.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.div_fmas.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.div_fmas.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.div_fmas.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.div_fmas.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.div_scale.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.div_scale.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.div_scale.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.div_scale.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.flbit.i32.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.flbit.i32.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.flbit.i32.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.flbit.i32.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.fract.f64.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.fract.f64.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.fract.f64.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.fract.f64.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.fract.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.fract.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.fract.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.fract.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.imad24.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.imad24.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.imad24.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.imad24.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.imax.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.imax.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.imax.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.imax.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.imin.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.imin.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.imin.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.imin.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.imul24.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.imul24.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.imul24.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.imul24.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.kill.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.kill.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.kill.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.kill.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.ldexp.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.ldexp.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.ldexp.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.ldexp.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.legacy.rsq.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.legacy.rsq.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.legacy.rsq.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.legacy.rsq.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.mul.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.mul.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.mul.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.mul.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.rcp.f64.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.f64.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.rcp.f64.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.f64.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.rcp.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.rcp.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.f64.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.f64.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.f64.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.f64.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.rsq.clamped.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.rsq.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.rsq.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.tex.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.tex.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.tex.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.tex.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.trig_preop.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.trig_preop.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.trig_preop.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.trig_preop.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.trunc.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.trunc.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.trunc.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.trunc.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.umad24.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.umad24.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.umad24.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.umad24.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.umax.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.umax.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.umax.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.umax.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.umin.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.umin.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.umin.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.umin.ll diff --git a/test/CodeGen/R600/llvm.AMDGPU.umul24.ll b/test/CodeGen/AMDGPU/llvm.AMDGPU.umul24.ll similarity index 100% rename from test/CodeGen/R600/llvm.AMDGPU.umul24.ll rename to test/CodeGen/AMDGPU/llvm.AMDGPU.umul24.ll diff --git a/test/CodeGen/R600/llvm.SI.fs.interp.ll b/test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.fs.interp.ll rename to test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll diff --git a/test/CodeGen/R600/llvm.SI.gather4.ll b/test/CodeGen/AMDGPU/llvm.SI.gather4.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.gather4.ll rename to test/CodeGen/AMDGPU/llvm.SI.gather4.ll diff --git a/test/CodeGen/R600/llvm.SI.getlod.ll b/test/CodeGen/AMDGPU/llvm.SI.getlod.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.getlod.ll rename to test/CodeGen/AMDGPU/llvm.SI.getlod.ll diff --git a/test/CodeGen/R600/llvm.SI.image.ll b/test/CodeGen/AMDGPU/llvm.SI.image.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.image.ll rename to test/CodeGen/AMDGPU/llvm.SI.image.ll diff --git a/test/CodeGen/R600/llvm.SI.image.sample.ll b/test/CodeGen/AMDGPU/llvm.SI.image.sample.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.image.sample.ll rename to test/CodeGen/AMDGPU/llvm.SI.image.sample.ll diff --git a/test/CodeGen/R600/llvm.SI.image.sample.o.ll b/test/CodeGen/AMDGPU/llvm.SI.image.sample.o.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.image.sample.o.ll rename to test/CodeGen/AMDGPU/llvm.SI.image.sample.o.ll diff --git a/test/CodeGen/R600/llvm.SI.imageload.ll b/test/CodeGen/AMDGPU/llvm.SI.imageload.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.imageload.ll rename to test/CodeGen/AMDGPU/llvm.SI.imageload.ll diff --git a/test/CodeGen/R600/llvm.SI.load.dword.ll b/test/CodeGen/AMDGPU/llvm.SI.load.dword.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.load.dword.ll rename to test/CodeGen/AMDGPU/llvm.SI.load.dword.ll diff --git a/test/CodeGen/R600/llvm.SI.resinfo.ll b/test/CodeGen/AMDGPU/llvm.SI.resinfo.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.resinfo.ll rename to test/CodeGen/AMDGPU/llvm.SI.resinfo.ll diff --git a/test/CodeGen/R600/llvm.SI.sample-masked.ll b/test/CodeGen/AMDGPU/llvm.SI.sample-masked.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.sample-masked.ll rename to test/CodeGen/AMDGPU/llvm.SI.sample-masked.ll diff --git a/test/CodeGen/R600/llvm.SI.sample.ll b/test/CodeGen/AMDGPU/llvm.SI.sample.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.sample.ll rename to test/CodeGen/AMDGPU/llvm.SI.sample.ll diff --git a/test/CodeGen/R600/llvm.SI.sampled.ll b/test/CodeGen/AMDGPU/llvm.SI.sampled.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.sampled.ll rename to test/CodeGen/AMDGPU/llvm.SI.sampled.ll diff --git a/test/CodeGen/R600/llvm.SI.sendmsg-m0.ll b/test/CodeGen/AMDGPU/llvm.SI.sendmsg-m0.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.sendmsg-m0.ll rename to test/CodeGen/AMDGPU/llvm.SI.sendmsg-m0.ll diff --git a/test/CodeGen/R600/llvm.SI.sendmsg.ll b/test/CodeGen/AMDGPU/llvm.SI.sendmsg.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.sendmsg.ll rename to test/CodeGen/AMDGPU/llvm.SI.sendmsg.ll diff --git a/test/CodeGen/R600/llvm.SI.tbuffer.store.ll b/test/CodeGen/AMDGPU/llvm.SI.tbuffer.store.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.tbuffer.store.ll rename to test/CodeGen/AMDGPU/llvm.SI.tbuffer.store.ll diff --git a/test/CodeGen/R600/llvm.SI.tid.ll b/test/CodeGen/AMDGPU/llvm.SI.tid.ll similarity index 100% rename from test/CodeGen/R600/llvm.SI.tid.ll rename to test/CodeGen/AMDGPU/llvm.SI.tid.ll diff --git a/test/CodeGen/R600/llvm.amdgpu.dp4.ll b/test/CodeGen/AMDGPU/llvm.amdgpu.dp4.ll similarity index 100% rename from test/CodeGen/R600/llvm.amdgpu.dp4.ll rename to test/CodeGen/AMDGPU/llvm.amdgpu.dp4.ll diff --git a/test/CodeGen/R600/llvm.amdgpu.kilp.ll b/test/CodeGen/AMDGPU/llvm.amdgpu.kilp.ll similarity index 100% rename from test/CodeGen/R600/llvm.amdgpu.kilp.ll rename to test/CodeGen/AMDGPU/llvm.amdgpu.kilp.ll diff --git a/test/CodeGen/R600/llvm.amdgpu.lrp.ll b/test/CodeGen/AMDGPU/llvm.amdgpu.lrp.ll similarity index 100% rename from test/CodeGen/R600/llvm.amdgpu.lrp.ll rename to test/CodeGen/AMDGPU/llvm.amdgpu.lrp.ll diff --git a/test/CodeGen/R600/llvm.cos.ll b/test/CodeGen/AMDGPU/llvm.cos.ll similarity index 100% rename from test/CodeGen/R600/llvm.cos.ll rename to test/CodeGen/AMDGPU/llvm.cos.ll diff --git a/test/CodeGen/R600/llvm.exp2.ll b/test/CodeGen/AMDGPU/llvm.exp2.ll similarity index 100% rename from test/CodeGen/R600/llvm.exp2.ll rename to test/CodeGen/AMDGPU/llvm.exp2.ll diff --git a/test/CodeGen/R600/llvm.log2.ll b/test/CodeGen/AMDGPU/llvm.log2.ll similarity index 100% rename from test/CodeGen/R600/llvm.log2.ll rename to test/CodeGen/AMDGPU/llvm.log2.ll diff --git a/test/CodeGen/R600/llvm.memcpy.ll b/test/CodeGen/AMDGPU/llvm.memcpy.ll similarity index 100% rename from test/CodeGen/R600/llvm.memcpy.ll rename to test/CodeGen/AMDGPU/llvm.memcpy.ll diff --git a/test/CodeGen/R600/llvm.pow.ll b/test/CodeGen/AMDGPU/llvm.pow.ll similarity index 100% rename from test/CodeGen/R600/llvm.pow.ll rename to test/CodeGen/AMDGPU/llvm.pow.ll diff --git a/test/CodeGen/R600/llvm.rint.f64.ll b/test/CodeGen/AMDGPU/llvm.rint.f64.ll similarity index 100% rename from test/CodeGen/R600/llvm.rint.f64.ll rename to test/CodeGen/AMDGPU/llvm.rint.f64.ll diff --git a/test/CodeGen/R600/llvm.rint.ll b/test/CodeGen/AMDGPU/llvm.rint.ll similarity index 100% rename from test/CodeGen/R600/llvm.rint.ll rename to test/CodeGen/AMDGPU/llvm.rint.ll diff --git a/test/CodeGen/R600/llvm.round.f64.ll b/test/CodeGen/AMDGPU/llvm.round.f64.ll similarity index 100% rename from test/CodeGen/R600/llvm.round.f64.ll rename to test/CodeGen/AMDGPU/llvm.round.f64.ll diff --git a/test/CodeGen/R600/llvm.round.ll b/test/CodeGen/AMDGPU/llvm.round.ll similarity index 100% rename from test/CodeGen/R600/llvm.round.ll rename to test/CodeGen/AMDGPU/llvm.round.ll diff --git a/test/CodeGen/R600/llvm.sin.ll b/test/CodeGen/AMDGPU/llvm.sin.ll similarity index 100% rename from test/CodeGen/R600/llvm.sin.ll rename to test/CodeGen/AMDGPU/llvm.sin.ll diff --git a/test/CodeGen/R600/llvm.sqrt.ll b/test/CodeGen/AMDGPU/llvm.sqrt.ll similarity index 100% rename from test/CodeGen/R600/llvm.sqrt.ll rename to test/CodeGen/AMDGPU/llvm.sqrt.ll diff --git a/test/CodeGen/R600/load-i1.ll b/test/CodeGen/AMDGPU/load-i1.ll similarity index 100% rename from test/CodeGen/R600/load-i1.ll rename to test/CodeGen/AMDGPU/load-i1.ll diff --git a/test/CodeGen/R600/load-input-fold.ll b/test/CodeGen/AMDGPU/load-input-fold.ll similarity index 100% rename from test/CodeGen/R600/load-input-fold.ll rename to test/CodeGen/AMDGPU/load-input-fold.ll diff --git a/test/CodeGen/R600/load.ll b/test/CodeGen/AMDGPU/load.ll similarity index 100% rename from test/CodeGen/R600/load.ll rename to test/CodeGen/AMDGPU/load.ll diff --git a/test/CodeGen/R600/load.vec.ll b/test/CodeGen/AMDGPU/load.vec.ll similarity index 100% rename from test/CodeGen/R600/load.vec.ll rename to test/CodeGen/AMDGPU/load.vec.ll diff --git a/test/CodeGen/R600/load64.ll b/test/CodeGen/AMDGPU/load64.ll similarity index 100% rename from test/CodeGen/R600/load64.ll rename to test/CodeGen/AMDGPU/load64.ll diff --git a/test/CodeGen/R600/local-64.ll b/test/CodeGen/AMDGPU/local-64.ll similarity index 100% rename from test/CodeGen/R600/local-64.ll rename to test/CodeGen/AMDGPU/local-64.ll diff --git a/test/CodeGen/R600/local-atomics.ll b/test/CodeGen/AMDGPU/local-atomics.ll similarity index 100% rename from test/CodeGen/R600/local-atomics.ll rename to test/CodeGen/AMDGPU/local-atomics.ll diff --git a/test/CodeGen/R600/local-atomics64.ll b/test/CodeGen/AMDGPU/local-atomics64.ll similarity index 100% rename from test/CodeGen/R600/local-atomics64.ll rename to test/CodeGen/AMDGPU/local-atomics64.ll diff --git a/test/CodeGen/R600/local-memory-two-objects.ll b/test/CodeGen/AMDGPU/local-memory-two-objects.ll similarity index 100% rename from test/CodeGen/R600/local-memory-two-objects.ll rename to test/CodeGen/AMDGPU/local-memory-two-objects.ll diff --git a/test/CodeGen/R600/local-memory.ll b/test/CodeGen/AMDGPU/local-memory.ll similarity index 100% rename from test/CodeGen/R600/local-memory.ll rename to test/CodeGen/AMDGPU/local-memory.ll diff --git a/test/CodeGen/R600/loop-address.ll b/test/CodeGen/AMDGPU/loop-address.ll similarity index 100% rename from test/CodeGen/R600/loop-address.ll rename to test/CodeGen/AMDGPU/loop-address.ll diff --git a/test/CodeGen/R600/loop-idiom.ll b/test/CodeGen/AMDGPU/loop-idiom.ll similarity index 100% rename from test/CodeGen/R600/loop-idiom.ll rename to test/CodeGen/AMDGPU/loop-idiom.ll diff --git a/test/CodeGen/R600/lshl.ll b/test/CodeGen/AMDGPU/lshl.ll similarity index 100% rename from test/CodeGen/R600/lshl.ll rename to test/CodeGen/AMDGPU/lshl.ll diff --git a/test/CodeGen/R600/lshr.ll b/test/CodeGen/AMDGPU/lshr.ll similarity index 100% rename from test/CodeGen/R600/lshr.ll rename to test/CodeGen/AMDGPU/lshr.ll diff --git a/test/CodeGen/R600/m0-spill.ll b/test/CodeGen/AMDGPU/m0-spill.ll similarity index 100% rename from test/CodeGen/R600/m0-spill.ll rename to test/CodeGen/AMDGPU/m0-spill.ll diff --git a/test/CodeGen/R600/mad-combine.ll b/test/CodeGen/AMDGPU/mad-combine.ll similarity index 100% rename from test/CodeGen/R600/mad-combine.ll rename to test/CodeGen/AMDGPU/mad-combine.ll diff --git a/test/CodeGen/R600/mad-sub.ll b/test/CodeGen/AMDGPU/mad-sub.ll similarity index 100% rename from test/CodeGen/R600/mad-sub.ll rename to test/CodeGen/AMDGPU/mad-sub.ll diff --git a/test/CodeGen/R600/mad_int24.ll b/test/CodeGen/AMDGPU/mad_int24.ll similarity index 100% rename from test/CodeGen/R600/mad_int24.ll rename to test/CodeGen/AMDGPU/mad_int24.ll diff --git a/test/CodeGen/R600/mad_uint24.ll b/test/CodeGen/AMDGPU/mad_uint24.ll similarity index 100% rename from test/CodeGen/R600/mad_uint24.ll rename to test/CodeGen/AMDGPU/mad_uint24.ll diff --git a/test/CodeGen/R600/madak.ll b/test/CodeGen/AMDGPU/madak.ll similarity index 100% rename from test/CodeGen/R600/madak.ll rename to test/CodeGen/AMDGPU/madak.ll diff --git a/test/CodeGen/R600/madmk.ll b/test/CodeGen/AMDGPU/madmk.ll similarity index 100% rename from test/CodeGen/R600/madmk.ll rename to test/CodeGen/AMDGPU/madmk.ll diff --git a/test/CodeGen/R600/max-literals.ll b/test/CodeGen/AMDGPU/max-literals.ll similarity index 100% rename from test/CodeGen/R600/max-literals.ll rename to test/CodeGen/AMDGPU/max-literals.ll diff --git a/test/CodeGen/R600/max.ll b/test/CodeGen/AMDGPU/max.ll similarity index 100% rename from test/CodeGen/R600/max.ll rename to test/CodeGen/AMDGPU/max.ll diff --git a/test/CodeGen/R600/max3.ll b/test/CodeGen/AMDGPU/max3.ll similarity index 100% rename from test/CodeGen/R600/max3.ll rename to test/CodeGen/AMDGPU/max3.ll diff --git a/test/CodeGen/R600/merge-stores.ll b/test/CodeGen/AMDGPU/merge-stores.ll similarity index 100% rename from test/CodeGen/R600/merge-stores.ll rename to test/CodeGen/AMDGPU/merge-stores.ll diff --git a/test/CodeGen/R600/min.ll b/test/CodeGen/AMDGPU/min.ll similarity index 100% rename from test/CodeGen/R600/min.ll rename to test/CodeGen/AMDGPU/min.ll diff --git a/test/CodeGen/R600/min3.ll b/test/CodeGen/AMDGPU/min3.ll similarity index 100% rename from test/CodeGen/R600/min3.ll rename to test/CodeGen/AMDGPU/min3.ll diff --git a/test/CodeGen/R600/missing-store.ll b/test/CodeGen/AMDGPU/missing-store.ll similarity index 100% rename from test/CodeGen/R600/missing-store.ll rename to test/CodeGen/AMDGPU/missing-store.ll diff --git a/test/CodeGen/R600/mubuf.ll b/test/CodeGen/AMDGPU/mubuf.ll similarity index 100% rename from test/CodeGen/R600/mubuf.ll rename to test/CodeGen/AMDGPU/mubuf.ll diff --git a/test/CodeGen/R600/mul.ll b/test/CodeGen/AMDGPU/mul.ll similarity index 100% rename from test/CodeGen/R600/mul.ll rename to test/CodeGen/AMDGPU/mul.ll diff --git a/test/CodeGen/R600/mul_int24.ll b/test/CodeGen/AMDGPU/mul_int24.ll similarity index 100% rename from test/CodeGen/R600/mul_int24.ll rename to test/CodeGen/AMDGPU/mul_int24.ll diff --git a/test/CodeGen/R600/mul_uint24.ll b/test/CodeGen/AMDGPU/mul_uint24.ll similarity index 100% rename from test/CodeGen/R600/mul_uint24.ll rename to test/CodeGen/AMDGPU/mul_uint24.ll diff --git a/test/CodeGen/R600/mulhu.ll b/test/CodeGen/AMDGPU/mulhu.ll similarity index 100% rename from test/CodeGen/R600/mulhu.ll rename to test/CodeGen/AMDGPU/mulhu.ll diff --git a/test/CodeGen/R600/no-initializer-constant-addrspace.ll b/test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll similarity index 100% rename from test/CodeGen/R600/no-initializer-constant-addrspace.ll rename to test/CodeGen/AMDGPU/no-initializer-constant-addrspace.ll diff --git a/test/CodeGen/R600/no-shrink-extloads.ll b/test/CodeGen/AMDGPU/no-shrink-extloads.ll similarity index 100% rename from test/CodeGen/R600/no-shrink-extloads.ll rename to test/CodeGen/AMDGPU/no-shrink-extloads.ll diff --git a/test/CodeGen/R600/operand-folding.ll b/test/CodeGen/AMDGPU/operand-folding.ll similarity index 100% rename from test/CodeGen/R600/operand-folding.ll rename to test/CodeGen/AMDGPU/operand-folding.ll diff --git a/test/CodeGen/R600/operand-spacing.ll b/test/CodeGen/AMDGPU/operand-spacing.ll similarity index 100% rename from test/CodeGen/R600/operand-spacing.ll rename to test/CodeGen/AMDGPU/operand-spacing.ll diff --git a/test/CodeGen/R600/or.ll b/test/CodeGen/AMDGPU/or.ll similarity index 100% rename from test/CodeGen/R600/or.ll rename to test/CodeGen/AMDGPU/or.ll diff --git a/test/CodeGen/R600/packetizer.ll b/test/CodeGen/AMDGPU/packetizer.ll similarity index 100% rename from test/CodeGen/R600/packetizer.ll rename to test/CodeGen/AMDGPU/packetizer.ll diff --git a/test/CodeGen/R600/parallelandifcollapse.ll b/test/CodeGen/AMDGPU/parallelandifcollapse.ll similarity index 100% rename from test/CodeGen/R600/parallelandifcollapse.ll rename to test/CodeGen/AMDGPU/parallelandifcollapse.ll diff --git a/test/CodeGen/R600/parallelorifcollapse.ll b/test/CodeGen/AMDGPU/parallelorifcollapse.ll similarity index 100% rename from test/CodeGen/R600/parallelorifcollapse.ll rename to test/CodeGen/AMDGPU/parallelorifcollapse.ll diff --git a/test/CodeGen/R600/predicate-dp4.ll b/test/CodeGen/AMDGPU/predicate-dp4.ll similarity index 100% rename from test/CodeGen/R600/predicate-dp4.ll rename to test/CodeGen/AMDGPU/predicate-dp4.ll diff --git a/test/CodeGen/R600/predicates.ll b/test/CodeGen/AMDGPU/predicates.ll similarity index 100% rename from test/CodeGen/R600/predicates.ll rename to test/CodeGen/AMDGPU/predicates.ll diff --git a/test/CodeGen/R600/private-memory-atomics.ll b/test/CodeGen/AMDGPU/private-memory-atomics.ll similarity index 100% rename from test/CodeGen/R600/private-memory-atomics.ll rename to test/CodeGen/AMDGPU/private-memory-atomics.ll diff --git a/test/CodeGen/R600/private-memory-broken.ll b/test/CodeGen/AMDGPU/private-memory-broken.ll similarity index 100% rename from test/CodeGen/R600/private-memory-broken.ll rename to test/CodeGen/AMDGPU/private-memory-broken.ll diff --git a/test/CodeGen/R600/private-memory.ll b/test/CodeGen/AMDGPU/private-memory.ll similarity index 100% rename from test/CodeGen/R600/private-memory.ll rename to test/CodeGen/AMDGPU/private-memory.ll diff --git a/test/CodeGen/R600/pv-packing.ll b/test/CodeGen/AMDGPU/pv-packing.ll similarity index 100% rename from test/CodeGen/R600/pv-packing.ll rename to test/CodeGen/AMDGPU/pv-packing.ll diff --git a/test/CodeGen/R600/pv.ll b/test/CodeGen/AMDGPU/pv.ll similarity index 100% rename from test/CodeGen/R600/pv.ll rename to test/CodeGen/AMDGPU/pv.ll diff --git a/test/CodeGen/R600/r600-encoding.ll b/test/CodeGen/AMDGPU/r600-encoding.ll similarity index 100% rename from test/CodeGen/R600/r600-encoding.ll rename to test/CodeGen/AMDGPU/r600-encoding.ll diff --git a/test/CodeGen/R600/r600-export-fix.ll b/test/CodeGen/AMDGPU/r600-export-fix.ll similarity index 100% rename from test/CodeGen/R600/r600-export-fix.ll rename to test/CodeGen/AMDGPU/r600-export-fix.ll diff --git a/test/CodeGen/R600/r600-infinite-loop-bug-while-reorganizing-vector.ll b/test/CodeGen/AMDGPU/r600-infinite-loop-bug-while-reorganizing-vector.ll similarity index 100% rename from test/CodeGen/R600/r600-infinite-loop-bug-while-reorganizing-vector.ll rename to test/CodeGen/AMDGPU/r600-infinite-loop-bug-while-reorganizing-vector.ll diff --git a/test/CodeGen/R600/r600cfg.ll b/test/CodeGen/AMDGPU/r600cfg.ll similarity index 100% rename from test/CodeGen/R600/r600cfg.ll rename to test/CodeGen/AMDGPU/r600cfg.ll diff --git a/test/CodeGen/R600/reciprocal.ll b/test/CodeGen/AMDGPU/reciprocal.ll similarity index 100% rename from test/CodeGen/R600/reciprocal.ll rename to test/CodeGen/AMDGPU/reciprocal.ll diff --git a/test/CodeGen/R600/register-count-comments.ll b/test/CodeGen/AMDGPU/register-count-comments.ll similarity index 100% rename from test/CodeGen/R600/register-count-comments.ll rename to test/CodeGen/AMDGPU/register-count-comments.ll diff --git a/test/CodeGen/R600/reorder-stores.ll b/test/CodeGen/AMDGPU/reorder-stores.ll similarity index 100% rename from test/CodeGen/R600/reorder-stores.ll rename to test/CodeGen/AMDGPU/reorder-stores.ll diff --git a/test/CodeGen/R600/rotl.i64.ll b/test/CodeGen/AMDGPU/rotl.i64.ll similarity index 100% rename from test/CodeGen/R600/rotl.i64.ll rename to test/CodeGen/AMDGPU/rotl.i64.ll diff --git a/test/CodeGen/R600/rotl.ll b/test/CodeGen/AMDGPU/rotl.ll similarity index 100% rename from test/CodeGen/R600/rotl.ll rename to test/CodeGen/AMDGPU/rotl.ll diff --git a/test/CodeGen/R600/rotr.i64.ll b/test/CodeGen/AMDGPU/rotr.i64.ll similarity index 100% rename from test/CodeGen/R600/rotr.i64.ll rename to test/CodeGen/AMDGPU/rotr.i64.ll diff --git a/test/CodeGen/R600/rotr.ll b/test/CodeGen/AMDGPU/rotr.ll similarity index 100% rename from test/CodeGen/R600/rotr.ll rename to test/CodeGen/AMDGPU/rotr.ll diff --git a/test/CodeGen/R600/rsq.ll b/test/CodeGen/AMDGPU/rsq.ll similarity index 100% rename from test/CodeGen/R600/rsq.ll rename to test/CodeGen/AMDGPU/rsq.ll diff --git a/test/CodeGen/R600/rv7x0_count3.ll b/test/CodeGen/AMDGPU/rv7x0_count3.ll similarity index 100% rename from test/CodeGen/R600/rv7x0_count3.ll rename to test/CodeGen/AMDGPU/rv7x0_count3.ll diff --git a/test/CodeGen/R600/s_movk_i32.ll b/test/CodeGen/AMDGPU/s_movk_i32.ll similarity index 100% rename from test/CodeGen/R600/s_movk_i32.ll rename to test/CodeGen/AMDGPU/s_movk_i32.ll diff --git a/test/CodeGen/R600/saddo.ll b/test/CodeGen/AMDGPU/saddo.ll similarity index 100% rename from test/CodeGen/R600/saddo.ll rename to test/CodeGen/AMDGPU/saddo.ll diff --git a/test/CodeGen/R600/salu-to-valu.ll b/test/CodeGen/AMDGPU/salu-to-valu.ll similarity index 100% rename from test/CodeGen/R600/salu-to-valu.ll rename to test/CodeGen/AMDGPU/salu-to-valu.ll diff --git a/test/CodeGen/R600/scalar_to_vector.ll b/test/CodeGen/AMDGPU/scalar_to_vector.ll similarity index 100% rename from test/CodeGen/R600/scalar_to_vector.ll rename to test/CodeGen/AMDGPU/scalar_to_vector.ll diff --git a/test/CodeGen/R600/schedule-fs-loop-nested-if.ll b/test/CodeGen/AMDGPU/schedule-fs-loop-nested-if.ll similarity index 100% rename from test/CodeGen/R600/schedule-fs-loop-nested-if.ll rename to test/CodeGen/AMDGPU/schedule-fs-loop-nested-if.ll diff --git a/test/CodeGen/R600/schedule-fs-loop-nested.ll b/test/CodeGen/AMDGPU/schedule-fs-loop-nested.ll similarity index 100% rename from test/CodeGen/R600/schedule-fs-loop-nested.ll rename to test/CodeGen/AMDGPU/schedule-fs-loop-nested.ll diff --git a/test/CodeGen/R600/schedule-fs-loop.ll b/test/CodeGen/AMDGPU/schedule-fs-loop.ll similarity index 100% rename from test/CodeGen/R600/schedule-fs-loop.ll rename to test/CodeGen/AMDGPU/schedule-fs-loop.ll diff --git a/test/CodeGen/R600/schedule-global-loads.ll b/test/CodeGen/AMDGPU/schedule-global-loads.ll similarity index 100% rename from test/CodeGen/R600/schedule-global-loads.ll rename to test/CodeGen/AMDGPU/schedule-global-loads.ll diff --git a/test/CodeGen/R600/schedule-if-2.ll b/test/CodeGen/AMDGPU/schedule-if-2.ll similarity index 100% rename from test/CodeGen/R600/schedule-if-2.ll rename to test/CodeGen/AMDGPU/schedule-if-2.ll diff --git a/test/CodeGen/R600/schedule-if.ll b/test/CodeGen/AMDGPU/schedule-if.ll similarity index 100% rename from test/CodeGen/R600/schedule-if.ll rename to test/CodeGen/AMDGPU/schedule-if.ll diff --git a/test/CodeGen/R600/schedule-kernel-arg-loads.ll b/test/CodeGen/AMDGPU/schedule-kernel-arg-loads.ll similarity index 100% rename from test/CodeGen/R600/schedule-kernel-arg-loads.ll rename to test/CodeGen/AMDGPU/schedule-kernel-arg-loads.ll diff --git a/test/CodeGen/R600/schedule-vs-if-nested-loop-failure.ll b/test/CodeGen/AMDGPU/schedule-vs-if-nested-loop-failure.ll similarity index 100% rename from test/CodeGen/R600/schedule-vs-if-nested-loop-failure.ll rename to test/CodeGen/AMDGPU/schedule-vs-if-nested-loop-failure.ll diff --git a/test/CodeGen/R600/schedule-vs-if-nested-loop.ll b/test/CodeGen/AMDGPU/schedule-vs-if-nested-loop.ll similarity index 100% rename from test/CodeGen/R600/schedule-vs-if-nested-loop.ll rename to test/CodeGen/AMDGPU/schedule-vs-if-nested-loop.ll diff --git a/test/CodeGen/R600/scratch-buffer.ll b/test/CodeGen/AMDGPU/scratch-buffer.ll similarity index 100% rename from test/CodeGen/R600/scratch-buffer.ll rename to test/CodeGen/AMDGPU/scratch-buffer.ll diff --git a/test/CodeGen/R600/sdiv.ll b/test/CodeGen/AMDGPU/sdiv.ll similarity index 100% rename from test/CodeGen/R600/sdiv.ll rename to test/CodeGen/AMDGPU/sdiv.ll diff --git a/test/CodeGen/R600/sdivrem24.ll b/test/CodeGen/AMDGPU/sdivrem24.ll similarity index 100% rename from test/CodeGen/R600/sdivrem24.ll rename to test/CodeGen/AMDGPU/sdivrem24.ll diff --git a/test/CodeGen/R600/sdivrem64.ll b/test/CodeGen/AMDGPU/sdivrem64.ll similarity index 100% rename from test/CodeGen/R600/sdivrem64.ll rename to test/CodeGen/AMDGPU/sdivrem64.ll diff --git a/test/CodeGen/R600/select-i1.ll b/test/CodeGen/AMDGPU/select-i1.ll similarity index 100% rename from test/CodeGen/R600/select-i1.ll rename to test/CodeGen/AMDGPU/select-i1.ll diff --git a/test/CodeGen/R600/select-vectors.ll b/test/CodeGen/AMDGPU/select-vectors.ll similarity index 100% rename from test/CodeGen/R600/select-vectors.ll rename to test/CodeGen/AMDGPU/select-vectors.ll diff --git a/test/CodeGen/R600/select.ll b/test/CodeGen/AMDGPU/select.ll similarity index 100% rename from test/CodeGen/R600/select.ll rename to test/CodeGen/AMDGPU/select.ll diff --git a/test/CodeGen/R600/select64.ll b/test/CodeGen/AMDGPU/select64.ll similarity index 100% rename from test/CodeGen/R600/select64.ll rename to test/CodeGen/AMDGPU/select64.ll diff --git a/test/CodeGen/R600/selectcc-cnd.ll b/test/CodeGen/AMDGPU/selectcc-cnd.ll similarity index 100% rename from test/CodeGen/R600/selectcc-cnd.ll rename to test/CodeGen/AMDGPU/selectcc-cnd.ll diff --git a/test/CodeGen/R600/selectcc-cnde-int.ll b/test/CodeGen/AMDGPU/selectcc-cnde-int.ll similarity index 100% rename from test/CodeGen/R600/selectcc-cnde-int.ll rename to test/CodeGen/AMDGPU/selectcc-cnde-int.ll diff --git a/test/CodeGen/R600/selectcc-icmp-select-float.ll b/test/CodeGen/AMDGPU/selectcc-icmp-select-float.ll similarity index 100% rename from test/CodeGen/R600/selectcc-icmp-select-float.ll rename to test/CodeGen/AMDGPU/selectcc-icmp-select-float.ll diff --git a/test/CodeGen/R600/selectcc-opt.ll b/test/CodeGen/AMDGPU/selectcc-opt.ll similarity index 100% rename from test/CodeGen/R600/selectcc-opt.ll rename to test/CodeGen/AMDGPU/selectcc-opt.ll diff --git a/test/CodeGen/R600/selectcc.ll b/test/CodeGen/AMDGPU/selectcc.ll similarity index 100% rename from test/CodeGen/R600/selectcc.ll rename to test/CodeGen/AMDGPU/selectcc.ll diff --git a/test/CodeGen/R600/set-dx10.ll b/test/CodeGen/AMDGPU/set-dx10.ll similarity index 100% rename from test/CodeGen/R600/set-dx10.ll rename to test/CodeGen/AMDGPU/set-dx10.ll diff --git a/test/CodeGen/R600/setcc-equivalent.ll b/test/CodeGen/AMDGPU/setcc-equivalent.ll similarity index 100% rename from test/CodeGen/R600/setcc-equivalent.ll rename to test/CodeGen/AMDGPU/setcc-equivalent.ll diff --git a/test/CodeGen/R600/setcc-opt.ll b/test/CodeGen/AMDGPU/setcc-opt.ll similarity index 100% rename from test/CodeGen/R600/setcc-opt.ll rename to test/CodeGen/AMDGPU/setcc-opt.ll diff --git a/test/CodeGen/R600/setcc.ll b/test/CodeGen/AMDGPU/setcc.ll similarity index 100% rename from test/CodeGen/R600/setcc.ll rename to test/CodeGen/AMDGPU/setcc.ll diff --git a/test/CodeGen/R600/setcc64.ll b/test/CodeGen/AMDGPU/setcc64.ll similarity index 100% rename from test/CodeGen/R600/setcc64.ll rename to test/CodeGen/AMDGPU/setcc64.ll diff --git a/test/CodeGen/R600/seto.ll b/test/CodeGen/AMDGPU/seto.ll similarity index 100% rename from test/CodeGen/R600/seto.ll rename to test/CodeGen/AMDGPU/seto.ll diff --git a/test/CodeGen/R600/setuo.ll b/test/CodeGen/AMDGPU/setuo.ll similarity index 100% rename from test/CodeGen/R600/setuo.ll rename to test/CodeGen/AMDGPU/setuo.ll diff --git a/test/CodeGen/R600/sext-eliminate.ll b/test/CodeGen/AMDGPU/sext-eliminate.ll similarity index 100% rename from test/CodeGen/R600/sext-eliminate.ll rename to test/CodeGen/AMDGPU/sext-eliminate.ll diff --git a/test/CodeGen/R600/sext-in-reg.ll b/test/CodeGen/AMDGPU/sext-in-reg.ll similarity index 100% rename from test/CodeGen/R600/sext-in-reg.ll rename to test/CodeGen/AMDGPU/sext-in-reg.ll diff --git a/test/CodeGen/R600/sgpr-control-flow.ll b/test/CodeGen/AMDGPU/sgpr-control-flow.ll similarity index 100% rename from test/CodeGen/R600/sgpr-control-flow.ll rename to test/CodeGen/AMDGPU/sgpr-control-flow.ll diff --git a/test/CodeGen/R600/sgpr-copy-duplicate-operand.ll b/test/CodeGen/AMDGPU/sgpr-copy-duplicate-operand.ll similarity index 100% rename from test/CodeGen/R600/sgpr-copy-duplicate-operand.ll rename to test/CodeGen/AMDGPU/sgpr-copy-duplicate-operand.ll diff --git a/test/CodeGen/R600/sgpr-copy.ll b/test/CodeGen/AMDGPU/sgpr-copy.ll similarity index 100% rename from test/CodeGen/R600/sgpr-copy.ll rename to test/CodeGen/AMDGPU/sgpr-copy.ll diff --git a/test/CodeGen/R600/shared-op-cycle.ll b/test/CodeGen/AMDGPU/shared-op-cycle.ll similarity index 100% rename from test/CodeGen/R600/shared-op-cycle.ll rename to test/CodeGen/AMDGPU/shared-op-cycle.ll diff --git a/test/CodeGen/R600/shl.ll b/test/CodeGen/AMDGPU/shl.ll similarity index 100% rename from test/CodeGen/R600/shl.ll rename to test/CodeGen/AMDGPU/shl.ll diff --git a/test/CodeGen/R600/shl_add_constant.ll b/test/CodeGen/AMDGPU/shl_add_constant.ll similarity index 100% rename from test/CodeGen/R600/shl_add_constant.ll rename to test/CodeGen/AMDGPU/shl_add_constant.ll diff --git a/test/CodeGen/R600/shl_add_ptr.ll b/test/CodeGen/AMDGPU/shl_add_ptr.ll similarity index 100% rename from test/CodeGen/R600/shl_add_ptr.ll rename to test/CodeGen/AMDGPU/shl_add_ptr.ll diff --git a/test/CodeGen/R600/si-annotate-cf-assertion.ll b/test/CodeGen/AMDGPU/si-annotate-cf-assertion.ll similarity index 100% rename from test/CodeGen/R600/si-annotate-cf-assertion.ll rename to test/CodeGen/AMDGPU/si-annotate-cf-assertion.ll diff --git a/test/CodeGen/R600/si-annotate-cf.ll b/test/CodeGen/AMDGPU/si-annotate-cf.ll similarity index 100% rename from test/CodeGen/R600/si-annotate-cf.ll rename to test/CodeGen/AMDGPU/si-annotate-cf.ll diff --git a/test/CodeGen/R600/si-lod-bias.ll b/test/CodeGen/AMDGPU/si-lod-bias.ll similarity index 100% rename from test/CodeGen/R600/si-lod-bias.ll rename to test/CodeGen/AMDGPU/si-lod-bias.ll diff --git a/test/CodeGen/R600/si-sgpr-spill.ll b/test/CodeGen/AMDGPU/si-sgpr-spill.ll similarity index 100% rename from test/CodeGen/R600/si-sgpr-spill.ll rename to test/CodeGen/AMDGPU/si-sgpr-spill.ll diff --git a/test/CodeGen/R600/si-spill-cf.ll b/test/CodeGen/AMDGPU/si-spill-cf.ll similarity index 100% rename from test/CodeGen/R600/si-spill-cf.ll rename to test/CodeGen/AMDGPU/si-spill-cf.ll diff --git a/test/CodeGen/R600/si-triv-disjoint-mem-access.ll b/test/CodeGen/AMDGPU/si-triv-disjoint-mem-access.ll similarity index 100% rename from test/CodeGen/R600/si-triv-disjoint-mem-access.ll rename to test/CodeGen/AMDGPU/si-triv-disjoint-mem-access.ll diff --git a/test/CodeGen/R600/si-vector-hang.ll b/test/CodeGen/AMDGPU/si-vector-hang.ll similarity index 100% rename from test/CodeGen/R600/si-vector-hang.ll rename to test/CodeGen/AMDGPU/si-vector-hang.ll diff --git a/test/CodeGen/R600/sign_extend.ll b/test/CodeGen/AMDGPU/sign_extend.ll similarity index 100% rename from test/CodeGen/R600/sign_extend.ll rename to test/CodeGen/AMDGPU/sign_extend.ll diff --git a/test/CodeGen/R600/simplify-demanded-bits-build-pair.ll b/test/CodeGen/AMDGPU/simplify-demanded-bits-build-pair.ll similarity index 100% rename from test/CodeGen/R600/simplify-demanded-bits-build-pair.ll rename to test/CodeGen/AMDGPU/simplify-demanded-bits-build-pair.ll diff --git a/test/CodeGen/R600/sint_to_fp.f64.ll b/test/CodeGen/AMDGPU/sint_to_fp.f64.ll similarity index 100% rename from test/CodeGen/R600/sint_to_fp.f64.ll rename to test/CodeGen/AMDGPU/sint_to_fp.f64.ll diff --git a/test/CodeGen/R600/sint_to_fp.ll b/test/CodeGen/AMDGPU/sint_to_fp.ll similarity index 100% rename from test/CodeGen/R600/sint_to_fp.ll rename to test/CodeGen/AMDGPU/sint_to_fp.ll diff --git a/test/CodeGen/R600/smrd.ll b/test/CodeGen/AMDGPU/smrd.ll similarity index 100% rename from test/CodeGen/R600/smrd.ll rename to test/CodeGen/AMDGPU/smrd.ll diff --git a/test/CodeGen/R600/split-scalar-i64-add.ll b/test/CodeGen/AMDGPU/split-scalar-i64-add.ll similarity index 100% rename from test/CodeGen/R600/split-scalar-i64-add.ll rename to test/CodeGen/AMDGPU/split-scalar-i64-add.ll diff --git a/test/CodeGen/R600/sra.ll b/test/CodeGen/AMDGPU/sra.ll similarity index 100% rename from test/CodeGen/R600/sra.ll rename to test/CodeGen/AMDGPU/sra.ll diff --git a/test/CodeGen/R600/srem.ll b/test/CodeGen/AMDGPU/srem.ll similarity index 100% rename from test/CodeGen/R600/srem.ll rename to test/CodeGen/AMDGPU/srem.ll diff --git a/test/CodeGen/R600/srl.ll b/test/CodeGen/AMDGPU/srl.ll similarity index 100% rename from test/CodeGen/R600/srl.ll rename to test/CodeGen/AMDGPU/srl.ll diff --git a/test/CodeGen/R600/ssubo.ll b/test/CodeGen/AMDGPU/ssubo.ll similarity index 100% rename from test/CodeGen/R600/ssubo.ll rename to test/CodeGen/AMDGPU/ssubo.ll diff --git a/test/CodeGen/R600/store-barrier.ll b/test/CodeGen/AMDGPU/store-barrier.ll similarity index 100% rename from test/CodeGen/R600/store-barrier.ll rename to test/CodeGen/AMDGPU/store-barrier.ll diff --git a/test/CodeGen/R600/store-v3i32.ll b/test/CodeGen/AMDGPU/store-v3i32.ll similarity index 100% rename from test/CodeGen/R600/store-v3i32.ll rename to test/CodeGen/AMDGPU/store-v3i32.ll diff --git a/test/CodeGen/R600/store-v3i64.ll b/test/CodeGen/AMDGPU/store-v3i64.ll similarity index 100% rename from test/CodeGen/R600/store-v3i64.ll rename to test/CodeGen/AMDGPU/store-v3i64.ll diff --git a/test/CodeGen/R600/store-vector-ptrs.ll b/test/CodeGen/AMDGPU/store-vector-ptrs.ll similarity index 100% rename from test/CodeGen/R600/store-vector-ptrs.ll rename to test/CodeGen/AMDGPU/store-vector-ptrs.ll diff --git a/test/CodeGen/R600/store.ll b/test/CodeGen/AMDGPU/store.ll similarity index 100% rename from test/CodeGen/R600/store.ll rename to test/CodeGen/AMDGPU/store.ll diff --git a/test/CodeGen/R600/store.r600.ll b/test/CodeGen/AMDGPU/store.r600.ll similarity index 100% rename from test/CodeGen/R600/store.r600.ll rename to test/CodeGen/AMDGPU/store.r600.ll diff --git a/test/CodeGen/R600/structurize.ll b/test/CodeGen/AMDGPU/structurize.ll similarity index 100% rename from test/CodeGen/R600/structurize.ll rename to test/CodeGen/AMDGPU/structurize.ll diff --git a/test/CodeGen/R600/structurize1.ll b/test/CodeGen/AMDGPU/structurize1.ll similarity index 100% rename from test/CodeGen/R600/structurize1.ll rename to test/CodeGen/AMDGPU/structurize1.ll diff --git a/test/CodeGen/R600/sub.ll b/test/CodeGen/AMDGPU/sub.ll similarity index 100% rename from test/CodeGen/R600/sub.ll rename to test/CodeGen/AMDGPU/sub.ll diff --git a/test/CodeGen/R600/subreg-coalescer-crash.ll b/test/CodeGen/AMDGPU/subreg-coalescer-crash.ll similarity index 100% rename from test/CodeGen/R600/subreg-coalescer-crash.ll rename to test/CodeGen/AMDGPU/subreg-coalescer-crash.ll diff --git a/test/CodeGen/R600/subreg-eliminate-dead.ll b/test/CodeGen/AMDGPU/subreg-eliminate-dead.ll similarity index 100% rename from test/CodeGen/R600/subreg-eliminate-dead.ll rename to test/CodeGen/AMDGPU/subreg-eliminate-dead.ll diff --git a/test/CodeGen/R600/swizzle-export.ll b/test/CodeGen/AMDGPU/swizzle-export.ll similarity index 100% rename from test/CodeGen/R600/swizzle-export.ll rename to test/CodeGen/AMDGPU/swizzle-export.ll diff --git a/test/CodeGen/R600/tex-clause-antidep.ll b/test/CodeGen/AMDGPU/tex-clause-antidep.ll similarity index 100% rename from test/CodeGen/R600/tex-clause-antidep.ll rename to test/CodeGen/AMDGPU/tex-clause-antidep.ll diff --git a/test/CodeGen/R600/texture-input-merge.ll b/test/CodeGen/AMDGPU/texture-input-merge.ll similarity index 100% rename from test/CodeGen/R600/texture-input-merge.ll rename to test/CodeGen/AMDGPU/texture-input-merge.ll diff --git a/test/CodeGen/R600/trunc-cmp-constant.ll b/test/CodeGen/AMDGPU/trunc-cmp-constant.ll similarity index 100% rename from test/CodeGen/R600/trunc-cmp-constant.ll rename to test/CodeGen/AMDGPU/trunc-cmp-constant.ll diff --git a/test/CodeGen/R600/trunc-store-f64-to-f16.ll b/test/CodeGen/AMDGPU/trunc-store-f64-to-f16.ll similarity index 100% rename from test/CodeGen/R600/trunc-store-f64-to-f16.ll rename to test/CodeGen/AMDGPU/trunc-store-f64-to-f16.ll diff --git a/test/CodeGen/R600/trunc-store-i1.ll b/test/CodeGen/AMDGPU/trunc-store-i1.ll similarity index 100% rename from test/CodeGen/R600/trunc-store-i1.ll rename to test/CodeGen/AMDGPU/trunc-store-i1.ll diff --git a/test/CodeGen/R600/trunc-vector-store-assertion-failure.ll b/test/CodeGen/AMDGPU/trunc-vector-store-assertion-failure.ll similarity index 100% rename from test/CodeGen/R600/trunc-vector-store-assertion-failure.ll rename to test/CodeGen/AMDGPU/trunc-vector-store-assertion-failure.ll diff --git a/test/CodeGen/R600/trunc.ll b/test/CodeGen/AMDGPU/trunc.ll similarity index 100% rename from test/CodeGen/R600/trunc.ll rename to test/CodeGen/AMDGPU/trunc.ll diff --git a/test/CodeGen/R600/tti-unroll-prefs.ll b/test/CodeGen/AMDGPU/tti-unroll-prefs.ll similarity index 100% rename from test/CodeGen/R600/tti-unroll-prefs.ll rename to test/CodeGen/AMDGPU/tti-unroll-prefs.ll diff --git a/test/CodeGen/R600/uaddo.ll b/test/CodeGen/AMDGPU/uaddo.ll similarity index 100% rename from test/CodeGen/R600/uaddo.ll rename to test/CodeGen/AMDGPU/uaddo.ll diff --git a/test/CodeGen/R600/udiv.ll b/test/CodeGen/AMDGPU/udiv.ll similarity index 100% rename from test/CodeGen/R600/udiv.ll rename to test/CodeGen/AMDGPU/udiv.ll diff --git a/test/CodeGen/R600/udivrem.ll b/test/CodeGen/AMDGPU/udivrem.ll similarity index 100% rename from test/CodeGen/R600/udivrem.ll rename to test/CodeGen/AMDGPU/udivrem.ll diff --git a/test/CodeGen/R600/udivrem24.ll b/test/CodeGen/AMDGPU/udivrem24.ll similarity index 100% rename from test/CodeGen/R600/udivrem24.ll rename to test/CodeGen/AMDGPU/udivrem24.ll diff --git a/test/CodeGen/R600/udivrem64.ll b/test/CodeGen/AMDGPU/udivrem64.ll similarity index 100% rename from test/CodeGen/R600/udivrem64.ll rename to test/CodeGen/AMDGPU/udivrem64.ll diff --git a/test/CodeGen/R600/uint_to_fp.f64.ll b/test/CodeGen/AMDGPU/uint_to_fp.f64.ll similarity index 100% rename from test/CodeGen/R600/uint_to_fp.f64.ll rename to test/CodeGen/AMDGPU/uint_to_fp.f64.ll diff --git a/test/CodeGen/R600/uint_to_fp.ll b/test/CodeGen/AMDGPU/uint_to_fp.ll similarity index 100% rename from test/CodeGen/R600/uint_to_fp.ll rename to test/CodeGen/AMDGPU/uint_to_fp.ll diff --git a/test/CodeGen/R600/unaligned-load-store.ll b/test/CodeGen/AMDGPU/unaligned-load-store.ll similarity index 100% rename from test/CodeGen/R600/unaligned-load-store.ll rename to test/CodeGen/AMDGPU/unaligned-load-store.ll diff --git a/test/CodeGen/R600/unhandled-loop-condition-assertion.ll b/test/CodeGen/AMDGPU/unhandled-loop-condition-assertion.ll similarity index 100% rename from test/CodeGen/R600/unhandled-loop-condition-assertion.ll rename to test/CodeGen/AMDGPU/unhandled-loop-condition-assertion.ll diff --git a/test/CodeGen/R600/unroll.ll b/test/CodeGen/AMDGPU/unroll.ll similarity index 100% rename from test/CodeGen/R600/unroll.ll rename to test/CodeGen/AMDGPU/unroll.ll diff --git a/test/CodeGen/R600/unsupported-cc.ll b/test/CodeGen/AMDGPU/unsupported-cc.ll similarity index 100% rename from test/CodeGen/R600/unsupported-cc.ll rename to test/CodeGen/AMDGPU/unsupported-cc.ll diff --git a/test/CodeGen/R600/urecip.ll b/test/CodeGen/AMDGPU/urecip.ll similarity index 100% rename from test/CodeGen/R600/urecip.ll rename to test/CodeGen/AMDGPU/urecip.ll diff --git a/test/CodeGen/R600/urem.ll b/test/CodeGen/AMDGPU/urem.ll similarity index 100% rename from test/CodeGen/R600/urem.ll rename to test/CodeGen/AMDGPU/urem.ll diff --git a/test/CodeGen/R600/use-sgpr-multiple-times.ll b/test/CodeGen/AMDGPU/use-sgpr-multiple-times.ll similarity index 100% rename from test/CodeGen/R600/use-sgpr-multiple-times.ll rename to test/CodeGen/AMDGPU/use-sgpr-multiple-times.ll diff --git a/test/CodeGen/R600/usubo.ll b/test/CodeGen/AMDGPU/usubo.ll similarity index 100% rename from test/CodeGen/R600/usubo.ll rename to test/CodeGen/AMDGPU/usubo.ll diff --git a/test/CodeGen/R600/v1i64-kernel-arg.ll b/test/CodeGen/AMDGPU/v1i64-kernel-arg.ll similarity index 100% rename from test/CodeGen/R600/v1i64-kernel-arg.ll rename to test/CodeGen/AMDGPU/v1i64-kernel-arg.ll diff --git a/test/CodeGen/R600/v_cndmask.ll b/test/CodeGen/AMDGPU/v_cndmask.ll similarity index 100% rename from test/CodeGen/R600/v_cndmask.ll rename to test/CodeGen/AMDGPU/v_cndmask.ll diff --git a/test/CodeGen/R600/valu-i1.ll b/test/CodeGen/AMDGPU/valu-i1.ll similarity index 100% rename from test/CodeGen/R600/valu-i1.ll rename to test/CodeGen/AMDGPU/valu-i1.ll diff --git a/test/CodeGen/R600/vector-alloca.ll b/test/CodeGen/AMDGPU/vector-alloca.ll similarity index 100% rename from test/CodeGen/R600/vector-alloca.ll rename to test/CodeGen/AMDGPU/vector-alloca.ll diff --git a/test/CodeGen/R600/vertex-fetch-encoding.ll b/test/CodeGen/AMDGPU/vertex-fetch-encoding.ll similarity index 100% rename from test/CodeGen/R600/vertex-fetch-encoding.ll rename to test/CodeGen/AMDGPU/vertex-fetch-encoding.ll diff --git a/test/CodeGen/R600/vop-shrink.ll b/test/CodeGen/AMDGPU/vop-shrink.ll similarity index 100% rename from test/CodeGen/R600/vop-shrink.ll rename to test/CodeGen/AMDGPU/vop-shrink.ll diff --git a/test/CodeGen/R600/vselect.ll b/test/CodeGen/AMDGPU/vselect.ll similarity index 100% rename from test/CodeGen/R600/vselect.ll rename to test/CodeGen/AMDGPU/vselect.ll diff --git a/test/CodeGen/R600/vselect64.ll b/test/CodeGen/AMDGPU/vselect64.ll similarity index 100% rename from test/CodeGen/R600/vselect64.ll rename to test/CodeGen/AMDGPU/vselect64.ll diff --git a/test/CodeGen/R600/vtx-fetch-branch.ll b/test/CodeGen/AMDGPU/vtx-fetch-branch.ll similarity index 100% rename from test/CodeGen/R600/vtx-fetch-branch.ll rename to test/CodeGen/AMDGPU/vtx-fetch-branch.ll diff --git a/test/CodeGen/R600/vtx-schedule.ll b/test/CodeGen/AMDGPU/vtx-schedule.ll similarity index 100% rename from test/CodeGen/R600/vtx-schedule.ll rename to test/CodeGen/AMDGPU/vtx-schedule.ll diff --git a/test/CodeGen/R600/wait.ll b/test/CodeGen/AMDGPU/wait.ll similarity index 100% rename from test/CodeGen/R600/wait.ll rename to test/CodeGen/AMDGPU/wait.ll diff --git a/test/CodeGen/R600/work-item-intrinsics.ll b/test/CodeGen/AMDGPU/work-item-intrinsics.ll similarity index 100% rename from test/CodeGen/R600/work-item-intrinsics.ll rename to test/CodeGen/AMDGPU/work-item-intrinsics.ll diff --git a/test/CodeGen/R600/wrong-transalu-pos-fix.ll b/test/CodeGen/AMDGPU/wrong-transalu-pos-fix.ll similarity index 100% rename from test/CodeGen/R600/wrong-transalu-pos-fix.ll rename to test/CodeGen/AMDGPU/wrong-transalu-pos-fix.ll diff --git a/test/CodeGen/R600/xor.ll b/test/CodeGen/AMDGPU/xor.ll similarity index 100% rename from test/CodeGen/R600/xor.ll rename to test/CodeGen/AMDGPU/xor.ll diff --git a/test/CodeGen/R600/zero_extend.ll b/test/CodeGen/AMDGPU/zero_extend.ll similarity index 100% rename from test/CodeGen/R600/zero_extend.ll rename to test/CodeGen/AMDGPU/zero_extend.ll diff --git a/test/CodeGen/R600/lit.local.cfg b/test/CodeGen/R600/lit.local.cfg deleted file mode 100644 index ad9ce2541ef..00000000000 --- a/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/test/MC/R600/ds-err.s b/test/MC/AMDGPU/ds-err.s similarity index 100% rename from test/MC/R600/ds-err.s rename to test/MC/AMDGPU/ds-err.s diff --git a/test/MC/R600/ds.s b/test/MC/AMDGPU/ds.s similarity index 100% rename from test/MC/R600/ds.s rename to test/MC/AMDGPU/ds.s diff --git a/test/MC/R600/flat.s b/test/MC/AMDGPU/flat.s similarity index 100% rename from test/MC/R600/flat.s rename to test/MC/AMDGPU/flat.s diff --git a/test/MC/AMDGPU/lit.local.cfg b/test/MC/AMDGPU/lit.local.cfg new file mode 100644 index 00000000000..2a665f06be7 --- /dev/null +++ b/test/MC/AMDGPU/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'AMDGPU' in config.root.targets: + config.unsupported = True diff --git a/test/MC/R600/mubuf.s b/test/MC/AMDGPU/mubuf.s similarity index 100% rename from test/MC/R600/mubuf.s rename to test/MC/AMDGPU/mubuf.s diff --git a/test/MC/R600/smrd.s b/test/MC/AMDGPU/smrd.s similarity index 100% rename from test/MC/R600/smrd.s rename to test/MC/AMDGPU/smrd.s diff --git a/test/MC/R600/sop1-err.s b/test/MC/AMDGPU/sop1-err.s similarity index 100% rename from test/MC/R600/sop1-err.s rename to test/MC/AMDGPU/sop1-err.s diff --git a/test/MC/R600/sop1.s b/test/MC/AMDGPU/sop1.s similarity index 100% rename from test/MC/R600/sop1.s rename to test/MC/AMDGPU/sop1.s diff --git a/test/MC/R600/sop2.s b/test/MC/AMDGPU/sop2.s similarity index 100% rename from test/MC/R600/sop2.s rename to test/MC/AMDGPU/sop2.s diff --git a/test/MC/R600/sopc.s b/test/MC/AMDGPU/sopc.s similarity index 100% rename from test/MC/R600/sopc.s rename to test/MC/AMDGPU/sopc.s diff --git a/test/MC/R600/sopk.s b/test/MC/AMDGPU/sopk.s similarity index 100% rename from test/MC/R600/sopk.s rename to test/MC/AMDGPU/sopk.s diff --git a/test/MC/R600/sopp.s b/test/MC/AMDGPU/sopp.s similarity index 100% rename from test/MC/R600/sopp.s rename to test/MC/AMDGPU/sopp.s diff --git a/test/MC/R600/vop1.s b/test/MC/AMDGPU/vop1.s similarity index 100% rename from test/MC/R600/vop1.s rename to test/MC/AMDGPU/vop1.s diff --git a/test/MC/R600/vop2-err.s b/test/MC/AMDGPU/vop2-err.s similarity index 100% rename from test/MC/R600/vop2-err.s rename to test/MC/AMDGPU/vop2-err.s diff --git a/test/MC/R600/vop2.s b/test/MC/AMDGPU/vop2.s similarity index 100% rename from test/MC/R600/vop2.s rename to test/MC/AMDGPU/vop2.s diff --git a/test/MC/R600/vop3-errs.s b/test/MC/AMDGPU/vop3-errs.s similarity index 100% rename from test/MC/R600/vop3-errs.s rename to test/MC/AMDGPU/vop3-errs.s diff --git a/test/MC/R600/vop3.s b/test/MC/AMDGPU/vop3.s similarity index 100% rename from test/MC/R600/vop3.s rename to test/MC/AMDGPU/vop3.s diff --git a/test/MC/R600/vopc.s b/test/MC/AMDGPU/vopc.s similarity index 100% rename from test/MC/R600/vopc.s rename to test/MC/AMDGPU/vopc.s diff --git a/test/MC/R600/lit.local.cfg b/test/MC/R600/lit.local.cfg deleted file mode 100644 index ad9ce2541ef..00000000000 --- a/test/MC/R600/lit.local.cfg +++ /dev/null @@ -1,2 +0,0 @@ -if not 'R600' in config.root.targets: - config.unsupported = True -- 2.34.1