diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.bfm.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfm.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.bfm.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.bfm.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.brev.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.brev.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.brev.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.brev.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.clamp.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.clamp.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.clamp.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.clamp.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.class.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.class.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.class.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.class.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.cube.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.cube.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.cube.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.cube.ll
diff --git a/...CodeGen/R600/llvm.AMDGPU.cvt_f32_ubyte.ll → ...deGen/AMDGPU/llvm.AMDGPU.cvt_f32_ubyte.ll b/...CodeGen/R600/llvm.AMDGPU.cvt_f32_ubyte.ll → ...deGen/AMDGPU/llvm.AMDGPU.cvt_f32_ubyte.ll
diff --git a/...est/CodeGen/R600/llvm.AMDGPU.div_fixup.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.div_fixup.ll b/...est/CodeGen/R600/llvm.AMDGPU.div_fixup.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.div_fixup.ll
diff --git a/...test/CodeGen/R600/llvm.AMDGPU.div_fmas.ll → ...st/CodeGen/AMDGPU/llvm.AMDGPU.div_fmas.ll b/...test/CodeGen/R600/llvm.AMDGPU.div_fmas.ll → ...st/CodeGen/AMDGPU/llvm.AMDGPU.div_fmas.ll
diff --git a/...est/CodeGen/R600/llvm.AMDGPU.div_scale.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.div_scale.ll b/...est/CodeGen/R600/llvm.AMDGPU.div_scale.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.div_scale.ll
diff --git a/...est/CodeGen/R600/llvm.AMDGPU.flbit.i32.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.flbit.i32.ll b/...est/CodeGen/R600/llvm.AMDGPU.flbit.i32.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.flbit.i32.ll
diff --git a/...est/CodeGen/R600/llvm.AMDGPU.fract.f64.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.fract.f64.ll b/...est/CodeGen/R600/llvm.AMDGPU.fract.f64.ll → ...t/CodeGen/AMDGPU/llvm.AMDGPU.fract.f64.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.fract.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.fract.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.fract.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.fract.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imad24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.imad24.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.imad24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.imad24.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imax.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imax.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.imax.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imax.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imin.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imin.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.imin.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.imin.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.imul24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.imul24.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.imul24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.imul24.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.kill.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.kill.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.kill.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.kill.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.ldexp.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.ldexp.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.ldexp.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.ldexp.ll
diff --git a/...st/CodeGen/R600/llvm.AMDGPU.legacy.rsq.ll → .../CodeGen/AMDGPU/llvm.AMDGPU.legacy.rsq.ll b/...st/CodeGen/R600/llvm.AMDGPU.legacy.rsq.ll → .../CodeGen/AMDGPU/llvm.AMDGPU.legacy.rsq.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.mul.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.mul.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.mul.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.mul.ll
diff --git a/.../test/CodeGen/R600/llvm.AMDGPU.rcp.f64.ll → ...est/CodeGen/AMDGPU/llvm.AMDGPU.rcp.f64.ll b/.../test/CodeGen/R600/llvm.AMDGPU.rcp.f64.ll → ...est/CodeGen/AMDGPU/llvm.AMDGPU.rcp.f64.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.rcp.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.rcp.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rcp.ll
diff --git a/...deGen/R600/llvm.AMDGPU.rsq.clamped.f64.ll → ...Gen/AMDGPU/llvm.AMDGPU.rsq.clamped.f64.ll b/...deGen/R600/llvm.AMDGPU.rsq.clamped.f64.ll → ...Gen/AMDGPU/llvm.AMDGPU.rsq.clamped.f64.ll
diff --git a/...t/CodeGen/R600/llvm.AMDGPU.rsq.clamped.ll → ...CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.ll b/...t/CodeGen/R600/llvm.AMDGPU.rsq.clamped.ll → ...CodeGen/AMDGPU/llvm.AMDGPU.rsq.clamped.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.rsq.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.rsq.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.tex.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.tex.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.tex.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.tex.ll
diff --git a/...st/CodeGen/R600/llvm.AMDGPU.trig_preop.ll → .../CodeGen/AMDGPU/llvm.AMDGPU.trig_preop.ll b/...st/CodeGen/R600/llvm.AMDGPU.trig_preop.ll → .../CodeGen/AMDGPU/llvm.AMDGPU.trig_preop.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.trunc.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.trunc.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.trunc.ll → .../test/CodeGen/AMDGPU/llvm.AMDGPU.trunc.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umad24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.umad24.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.umad24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.umad24.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umax.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umax.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.umax.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umax.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umin.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umin.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.umin.ll → llvm/test/CodeGen/AMDGPU/llvm.AMDGPU.umin.ll
diff --git a/llvm/test/CodeGen/R600/llvm.AMDGPU.umul24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.umul24.ll b/llvm/test/CodeGen/R600/llvm.AMDGPU.umul24.ll → ...test/CodeGen/AMDGPU/llvm.AMDGPU.umul24.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.fs.interp.ll → .../test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll b/llvm/test/CodeGen/R600/llvm.SI.fs.interp.ll → .../test/CodeGen/AMDGPU/llvm.SI.fs.interp.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.gather4.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.gather4.ll b/llvm/test/CodeGen/R600/llvm.SI.gather4.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.gather4.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.getlod.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.getlod.ll b/llvm/test/CodeGen/R600/llvm.SI.getlod.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.getlod.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.image.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.image.ll b/llvm/test/CodeGen/R600/llvm.SI.image.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.image.ll
diff --git a/...test/CodeGen/R600/llvm.SI.image.sample.ll → ...st/CodeGen/AMDGPU/llvm.SI.image.sample.ll b/...test/CodeGen/R600/llvm.SI.image.sample.ll → ...st/CodeGen/AMDGPU/llvm.SI.image.sample.ll
diff --git a/...st/CodeGen/R600/llvm.SI.image.sample.o.ll → .../CodeGen/AMDGPU/llvm.SI.image.sample.o.ll b/...st/CodeGen/R600/llvm.SI.image.sample.o.ll → .../CodeGen/AMDGPU/llvm.SI.image.sample.o.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.imageload.ll → .../test/CodeGen/AMDGPU/llvm.SI.imageload.ll b/llvm/test/CodeGen/R600/llvm.SI.imageload.ll → .../test/CodeGen/AMDGPU/llvm.SI.imageload.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.load.dword.ll → ...test/CodeGen/AMDGPU/llvm.SI.load.dword.ll b/llvm/test/CodeGen/R600/llvm.SI.load.dword.ll → ...test/CodeGen/AMDGPU/llvm.SI.load.dword.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.resinfo.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.resinfo.ll b/llvm/test/CodeGen/R600/llvm.SI.resinfo.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.resinfo.ll
diff --git a/...est/CodeGen/R600/llvm.SI.sample-masked.ll → ...t/CodeGen/AMDGPU/llvm.SI.sample-masked.ll b/...est/CodeGen/R600/llvm.SI.sample-masked.ll → ...t/CodeGen/AMDGPU/llvm.SI.sample-masked.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.sample.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.sample.ll b/llvm/test/CodeGen/R600/llvm.SI.sample.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.sample.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.sampled.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.sampled.ll b/llvm/test/CodeGen/R600/llvm.SI.sampled.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.sampled.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.sendmsg-m0.ll → ...test/CodeGen/AMDGPU/llvm.SI.sendmsg-m0.ll b/llvm/test/CodeGen/R600/llvm.SI.sendmsg-m0.ll → ...test/CodeGen/AMDGPU/llvm.SI.sendmsg-m0.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.sendmsg.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.sendmsg.ll b/llvm/test/CodeGen/R600/llvm.SI.sendmsg.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.sendmsg.ll
diff --git a/...est/CodeGen/R600/llvm.SI.tbuffer.store.ll → ...t/CodeGen/AMDGPU/llvm.SI.tbuffer.store.ll b/...est/CodeGen/R600/llvm.SI.tbuffer.store.ll → ...t/CodeGen/AMDGPU/llvm.SI.tbuffer.store.ll
diff --git a/llvm/test/CodeGen/R600/llvm.SI.tid.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.tid.ll b/llvm/test/CodeGen/R600/llvm.SI.tid.ll → llvm/test/CodeGen/AMDGPU/llvm.SI.tid.ll
diff --git a/llvm/test/CodeGen/R600/llvm.amdgpu.dp4.ll → llvm/test/CodeGen/AMDGPU/llvm.amdgpu.dp4.ll b/llvm/test/CodeGen/R600/llvm.amdgpu.dp4.ll → llvm/test/CodeGen/AMDGPU/llvm.amdgpu.dp4.ll
diff --git a/llvm/test/CodeGen/R600/llvm.amdgpu.kilp.ll → llvm/test/CodeGen/AMDGPU/llvm.amdgpu.kilp.ll b/llvm/test/CodeGen/R600/llvm.amdgpu.kilp.ll → llvm/test/CodeGen/AMDGPU/llvm.amdgpu.kilp.ll
diff --git a/llvm/test/CodeGen/R600/llvm.amdgpu.lrp.ll → llvm/test/CodeGen/AMDGPU/llvm.amdgpu.lrp.ll b/llvm/test/CodeGen/R600/llvm.amdgpu.lrp.ll → llvm/test/CodeGen/AMDGPU/llvm.amdgpu.lrp.ll
diff --git a/llvm/test/CodeGen/R600/llvm.cos.ll → llvm/test/CodeGen/AMDGPU/llvm.cos.ll b/llvm/test/CodeGen/R600/llvm.cos.ll → llvm/test/CodeGen/AMDGPU/llvm.cos.ll
diff --git a/llvm/test/CodeGen/R600/llvm.exp2.ll → llvm/test/CodeGen/AMDGPU/llvm.exp2.ll b/llvm/test/CodeGen/R600/llvm.exp2.ll → llvm/test/CodeGen/AMDGPU/llvm.exp2.ll
diff --git a/llvm/test/CodeGen/R600/llvm.log2.ll → llvm/test/CodeGen/AMDGPU/llvm.log2.ll b/llvm/test/CodeGen/R600/llvm.log2.ll → llvm/test/CodeGen/AMDGPU/llvm.log2.ll
diff --git a/llvm/test/CodeGen/R600/llvm.memcpy.ll → llvm/test/CodeGen/AMDGPU/llvm.memcpy.ll b/llvm/test/CodeGen/R600/llvm.memcpy.ll → llvm/test/CodeGen/AMDGPU/llvm.memcpy.ll
diff --git a/llvm/test/CodeGen/R600/llvm.pow.ll → llvm/test/CodeGen/AMDGPU/llvm.pow.ll b/llvm/test/CodeGen/R600/llvm.pow.ll → llvm/test/CodeGen/AMDGPU/llvm.pow.ll
diff --git a/llvm/test/CodeGen/R600/llvm.rint.f64.ll → llvm/test/CodeGen/AMDGPU/llvm.rint.f64.ll b/llvm/test/CodeGen/R600/llvm.rint.f64.ll → llvm/test/CodeGen/AMDGPU/llvm.rint.f64.ll
diff --git a/llvm/test/CodeGen/R600/llvm.rint.ll → llvm/test/CodeGen/AMDGPU/llvm.rint.ll b/llvm/test/CodeGen/R600/llvm.rint.ll → llvm/test/CodeGen/AMDGPU/llvm.rint.ll
diff --git a/llvm/test/CodeGen/R600/llvm.round.f64.ll → llvm/test/CodeGen/AMDGPU/llvm.round.f64.ll b/llvm/test/CodeGen/R600/llvm.round.f64.ll → llvm/test/CodeGen/AMDGPU/llvm.round.f64.ll
diff --git a/llvm/test/CodeGen/R600/llvm.round.ll → llvm/test/CodeGen/AMDGPU/llvm.round.ll b/llvm/test/CodeGen/R600/llvm.round.ll → llvm/test/CodeGen/AMDGPU/llvm.round.ll
diff --git a/llvm/test/CodeGen/R600/llvm.sin.ll → llvm/test/CodeGen/AMDGPU/llvm.sin.ll b/llvm/test/CodeGen/R600/llvm.sin.ll → llvm/test/CodeGen/AMDGPU/llvm.sin.ll
diff --git a/llvm/test/CodeGen/R600/llvm.sqrt.ll → llvm/test/CodeGen/AMDGPU/llvm.sqrt.ll b/llvm/test/CodeGen/R600/llvm.sqrt.ll → llvm/test/CodeGen/AMDGPU/llvm.sqrt.ll
diff --git a/llvm/test/CodeGen/R600/load-i1.ll → llvm/test/CodeGen/AMDGPU/load-i1.ll b/llvm/test/CodeGen/R600/load-i1.ll → llvm/test/CodeGen/AMDGPU/load-i1.ll
diff --git a/llvm/test/CodeGen/R600/load-input-fold.ll → llvm/test/CodeGen/AMDGPU/load-input-fold.ll b/llvm/test/CodeGen/R600/load-input-fold.ll → llvm/test/CodeGen/AMDGPU/load-input-fold.ll
diff --git a/llvm/test/CodeGen/R600/load.ll → llvm/test/CodeGen/AMDGPU/load.ll b/llvm/test/CodeGen/R600/load.ll → llvm/test/CodeGen/AMDGPU/load.ll
diff --git a/llvm/test/CodeGen/R600/load.vec.ll → llvm/test/CodeGen/AMDGPU/load.vec.ll b/llvm/test/CodeGen/R600/load.vec.ll → llvm/test/CodeGen/AMDGPU/load.vec.ll
diff --git a/llvm/test/CodeGen/R600/load64.ll → llvm/test/CodeGen/AMDGPU/load64.ll b/llvm/test/CodeGen/R600/load64.ll → llvm/test/CodeGen/AMDGPU/load64.ll
diff --git a/llvm/test/CodeGen/R600/local-64.ll → llvm/test/CodeGen/AMDGPU/local-64.ll b/llvm/test/CodeGen/R600/local-64.ll → llvm/test/CodeGen/AMDGPU/local-64.ll
diff --git a/llvm/test/CodeGen/R600/local-atomics.ll → llvm/test/CodeGen/AMDGPU/local-atomics.ll b/llvm/test/CodeGen/R600/local-atomics.ll → llvm/test/CodeGen/AMDGPU/local-atomics.ll
diff --git a/llvm/test/CodeGen/R600/local-atomics64.ll → llvm/test/CodeGen/AMDGPU/local-atomics64.ll b/llvm/test/CodeGen/R600/local-atomics64.ll → llvm/test/CodeGen/AMDGPU/local-atomics64.ll
diff --git a/.../CodeGen/R600/local-memory-two-objects.ll → ...odeGen/AMDGPU/local-memory-two-objects.ll b/.../CodeGen/R600/local-memory-two-objects.ll → ...odeGen/AMDGPU/local-memory-two-objects.ll
diff --git a/llvm/test/CodeGen/R600/local-memory.ll → llvm/test/CodeGen/AMDGPU/local-memory.ll b/llvm/test/CodeGen/R600/local-memory.ll → llvm/test/CodeGen/AMDGPU/local-memory.ll
diff --git a/llvm/test/CodeGen/R600/loop-address.ll → llvm/test/CodeGen/AMDGPU/loop-address.ll b/llvm/test/CodeGen/R600/loop-address.ll → llvm/test/CodeGen/AMDGPU/loop-address.ll
diff --git a/llvm/test/CodeGen/R600/loop-idiom.ll → llvm/test/CodeGen/AMDGPU/loop-idiom.ll b/llvm/test/CodeGen/R600/loop-idiom.ll → llvm/test/CodeGen/AMDGPU/loop-idiom.ll
diff --git a/llvm/test/CodeGen/R600/lshl.ll → llvm/test/CodeGen/AMDGPU/lshl.ll b/llvm/test/CodeGen/R600/lshl.ll → llvm/test/CodeGen/AMDGPU/lshl.ll
diff --git a/llvm/test/CodeGen/R600/lshr.ll → llvm/test/CodeGen/AMDGPU/lshr.ll b/llvm/test/CodeGen/R600/lshr.ll → llvm/test/CodeGen/AMDGPU/lshr.ll
diff --git a/llvm/test/CodeGen/R600/m0-spill.ll → llvm/test/CodeGen/AMDGPU/m0-spill.ll b/llvm/test/CodeGen/R600/m0-spill.ll → llvm/test/CodeGen/AMDGPU/m0-spill.ll
diff --git a/llvm/test/CodeGen/R600/mad-combine.ll → llvm/test/CodeGen/AMDGPU/mad-combine.ll b/llvm/test/CodeGen/R600/mad-combine.ll → llvm/test/CodeGen/AMDGPU/mad-combine.ll
diff --git a/llvm/test/CodeGen/R600/mad-sub.ll → llvm/test/CodeGen/AMDGPU/mad-sub.ll b/llvm/test/CodeGen/R600/mad-sub.ll → llvm/test/CodeGen/AMDGPU/mad-sub.ll
diff --git a/llvm/test/CodeGen/R600/mad_int24.ll → llvm/test/CodeGen/AMDGPU/mad_int24.ll b/llvm/test/CodeGen/R600/mad_int24.ll → llvm/test/CodeGen/AMDGPU/mad_int24.ll
diff --git a/llvm/test/CodeGen/R600/mad_uint24.ll → llvm/test/CodeGen/AMDGPU/mad_uint24.ll b/llvm/test/CodeGen/R600/mad_uint24.ll → llvm/test/CodeGen/AMDGPU/mad_uint24.ll
diff --git a/llvm/test/CodeGen/R600/madak.ll → llvm/test/CodeGen/AMDGPU/madak.ll b/llvm/test/CodeGen/R600/madak.ll → llvm/test/CodeGen/AMDGPU/madak.ll
diff --git a/llvm/test/CodeGen/R600/madmk.ll → llvm/test/CodeGen/AMDGPU/madmk.ll b/llvm/test/CodeGen/R600/madmk.ll → llvm/test/CodeGen/AMDGPU/madmk.ll
diff --git a/llvm/test/CodeGen/R600/max-literals.ll → llvm/test/CodeGen/AMDGPU/max-literals.ll b/llvm/test/CodeGen/R600/max-literals.ll → llvm/test/CodeGen/AMDGPU/max-literals.ll
diff --git a/llvm/test/CodeGen/R600/max.ll → llvm/test/CodeGen/AMDGPU/max.ll b/llvm/test/CodeGen/R600/max.ll → llvm/test/CodeGen/AMDGPU/max.ll
diff --git a/llvm/test/CodeGen/R600/max3.ll → llvm/test/CodeGen/AMDGPU/max3.ll b/llvm/test/CodeGen/R600/max3.ll → llvm/test/CodeGen/AMDGPU/max3.ll
diff --git a/llvm/test/CodeGen/R600/merge-stores.ll → llvm/test/CodeGen/AMDGPU/merge-stores.ll b/llvm/test/CodeGen/R600/merge-stores.ll → llvm/test/CodeGen/AMDGPU/merge-stores.ll
diff --git a/llvm/test/CodeGen/R600/min.ll → llvm/test/CodeGen/AMDGPU/min.ll b/llvm/test/CodeGen/R600/min.ll → llvm/test/CodeGen/AMDGPU/min.ll
diff --git a/llvm/test/CodeGen/R600/min3.ll → llvm/test/CodeGen/AMDGPU/min3.ll b/llvm/test/CodeGen/R600/min3.ll → llvm/test/CodeGen/AMDGPU/min3.ll
diff --git a/llvm/test/CodeGen/R600/missing-store.ll → llvm/test/CodeGen/AMDGPU/missing-store.ll b/llvm/test/CodeGen/R600/missing-store.ll → llvm/test/CodeGen/AMDGPU/missing-store.ll
diff --git a/llvm/test/CodeGen/R600/mubuf.ll → llvm/test/CodeGen/AMDGPU/mubuf.ll b/llvm/test/CodeGen/R600/mubuf.ll → llvm/test/CodeGen/AMDGPU/mubuf.ll
diff --git a/llvm/test/CodeGen/R600/mul.ll → llvm/test/CodeGen/AMDGPU/mul.ll b/llvm/test/CodeGen/R600/mul.ll → llvm/test/CodeGen/AMDGPU/mul.ll
diff --git a/llvm/test/CodeGen/R600/mul_int24.ll → llvm/test/CodeGen/AMDGPU/mul_int24.ll b/llvm/test/CodeGen/R600/mul_int24.ll → llvm/test/CodeGen/AMDGPU/mul_int24.ll
diff --git a/llvm/test/CodeGen/R600/mul_uint24.ll → llvm/test/CodeGen/AMDGPU/mul_uint24.ll b/llvm/test/CodeGen/R600/mul_uint24.ll → llvm/test/CodeGen/AMDGPU/mul_uint24.ll
diff --git a/llvm/test/CodeGen/R600/mulhu.ll → llvm/test/CodeGen/AMDGPU/mulhu.ll b/llvm/test/CodeGen/R600/mulhu.ll → llvm/test/CodeGen/AMDGPU/mulhu.ll
diff --git a/...R600/no-initializer-constant-addrspace.ll → ...DGPU/no-initializer-constant-addrspace.ll b/...R600/no-initializer-constant-addrspace.ll → ...DGPU/no-initializer-constant-addrspace.ll
diff --git a/llvm/test/CodeGen/R600/no-shrink-extloads.ll → ...test/CodeGen/AMDGPU/no-shrink-extloads.ll b/llvm/test/CodeGen/R600/no-shrink-extloads.ll → ...test/CodeGen/AMDGPU/no-shrink-extloads.ll
diff --git a/llvm/test/CodeGen/R600/operand-folding.ll → llvm/test/CodeGen/AMDGPU/operand-folding.ll b/llvm/test/CodeGen/R600/operand-folding.ll → llvm/test/CodeGen/AMDGPU/operand-folding.ll
diff --git a/llvm/test/CodeGen/R600/operand-spacing.ll → llvm/test/CodeGen/AMDGPU/operand-spacing.ll b/llvm/test/CodeGen/R600/operand-spacing.ll → llvm/test/CodeGen/AMDGPU/operand-spacing.ll
diff --git a/llvm/test/CodeGen/R600/or.ll → llvm/test/CodeGen/AMDGPU/or.ll b/llvm/test/CodeGen/R600/or.ll → llvm/test/CodeGen/AMDGPU/or.ll
diff --git a/llvm/test/CodeGen/R600/packetizer.ll → llvm/test/CodeGen/AMDGPU/packetizer.ll b/llvm/test/CodeGen/R600/packetizer.ll → llvm/test/CodeGen/AMDGPU/packetizer.ll
diff --git a/...est/CodeGen/R600/parallelandifcollapse.ll → ...t/CodeGen/AMDGPU/parallelandifcollapse.ll b/...est/CodeGen/R600/parallelandifcollapse.ll → ...t/CodeGen/AMDGPU/parallelandifcollapse.ll
diff --git a/...test/CodeGen/R600/parallelorifcollapse.ll → ...st/CodeGen/AMDGPU/parallelorifcollapse.ll b/...test/CodeGen/R600/parallelorifcollapse.ll → ...st/CodeGen/AMDGPU/parallelorifcollapse.ll
diff --git a/llvm/test/CodeGen/R600/predicate-dp4.ll → llvm/test/CodeGen/AMDGPU/predicate-dp4.ll b/llvm/test/CodeGen/R600/predicate-dp4.ll → llvm/test/CodeGen/AMDGPU/predicate-dp4.ll
diff --git a/llvm/test/CodeGen/R600/predicates.ll → llvm/test/CodeGen/AMDGPU/predicates.ll b/llvm/test/CodeGen/R600/predicates.ll → llvm/test/CodeGen/AMDGPU/predicates.ll
diff --git a/...st/CodeGen/R600/private-memory-atomics.ll → .../CodeGen/AMDGPU/private-memory-atomics.ll b/...st/CodeGen/R600/private-memory-atomics.ll → .../CodeGen/AMDGPU/private-memory-atomics.ll
diff --git a/...est/CodeGen/R600/private-memory-broken.ll → ...t/CodeGen/AMDGPU/private-memory-broken.ll b/...est/CodeGen/R600/private-memory-broken.ll → ...t/CodeGen/AMDGPU/private-memory-broken.ll
diff --git a/llvm/test/CodeGen/R600/private-memory.ll → llvm/test/CodeGen/AMDGPU/private-memory.ll b/llvm/test/CodeGen/R600/private-memory.ll → llvm/test/CodeGen/AMDGPU/private-memory.ll
diff --git a/llvm/test/CodeGen/R600/pv-packing.ll → llvm/test/CodeGen/AMDGPU/pv-packing.ll b/llvm/test/CodeGen/R600/pv-packing.ll → llvm/test/CodeGen/AMDGPU/pv-packing.ll
diff --git a/llvm/test/CodeGen/R600/pv.ll → llvm/test/CodeGen/AMDGPU/pv.ll b/llvm/test/CodeGen/R600/pv.ll → llvm/test/CodeGen/AMDGPU/pv.ll
diff --git a/llvm/test/CodeGen/R600/r600-encoding.ll → llvm/test/CodeGen/AMDGPU/r600-encoding.ll b/llvm/test/CodeGen/R600/r600-encoding.ll → llvm/test/CodeGen/AMDGPU/r600-encoding.ll
diff --git a/llvm/test/CodeGen/R600/r600-export-fix.ll → llvm/test/CodeGen/AMDGPU/r600-export-fix.ll b/llvm/test/CodeGen/R600/r600-export-fix.ll → llvm/test/CodeGen/AMDGPU/r600-export-fix.ll
diff --git a/...ite-loop-bug-while-reorganizing-vector.ll → ...ite-loop-bug-while-reorganizing-vector.ll b/...ite-loop-bug-while-reorganizing-vector.ll → ...ite-loop-bug-while-reorganizing-vector.ll
diff --git a/llvm/test/CodeGen/R600/r600cfg.ll → llvm/test/CodeGen/AMDGPU/r600cfg.ll b/llvm/test/CodeGen/R600/r600cfg.ll → llvm/test/CodeGen/AMDGPU/r600cfg.ll
diff --git a/llvm/test/CodeGen/R600/reciprocal.ll → llvm/test/CodeGen/AMDGPU/reciprocal.ll b/llvm/test/CodeGen/R600/reciprocal.ll → llvm/test/CodeGen/AMDGPU/reciprocal.ll
diff --git a/...t/CodeGen/R600/register-count-comments.ll → ...CodeGen/AMDGPU/register-count-comments.ll b/...t/CodeGen/R600/register-count-comments.ll → ...CodeGen/AMDGPU/register-count-comments.ll
diff --git a/llvm/test/CodeGen/R600/reorder-stores.ll → llvm/test/CodeGen/AMDGPU/reorder-stores.ll b/llvm/test/CodeGen/R600/reorder-stores.ll → llvm/test/CodeGen/AMDGPU/reorder-stores.ll
diff --git a/llvm/test/CodeGen/R600/rotl.i64.ll → llvm/test/CodeGen/AMDGPU/rotl.i64.ll b/llvm/test/CodeGen/R600/rotl.i64.ll → llvm/test/CodeGen/AMDGPU/rotl.i64.ll
diff --git a/llvm/test/CodeGen/R600/rotl.ll → llvm/test/CodeGen/AMDGPU/rotl.ll b/llvm/test/CodeGen/R600/rotl.ll → llvm/test/CodeGen/AMDGPU/rotl.ll
diff --git a/llvm/test/CodeGen/R600/rotr.i64.ll → llvm/test/CodeGen/AMDGPU/rotr.i64.ll b/llvm/test/CodeGen/R600/rotr.i64.ll → llvm/test/CodeGen/AMDGPU/rotr.i64.ll
diff --git a/llvm/test/CodeGen/R600/rotr.ll → llvm/test/CodeGen/AMDGPU/rotr.ll b/llvm/test/CodeGen/R600/rotr.ll → llvm/test/CodeGen/AMDGPU/rotr.ll
diff --git a/llvm/test/CodeGen/R600/rsq.ll → llvm/test/CodeGen/AMDGPU/rsq.ll b/llvm/test/CodeGen/R600/rsq.ll → llvm/test/CodeGen/AMDGPU/rsq.ll
diff --git a/llvm/test/CodeGen/R600/rv7x0_count3.ll → llvm/test/CodeGen/AMDGPU/rv7x0_count3.ll b/llvm/test/CodeGen/R600/rv7x0_count3.ll → llvm/test/CodeGen/AMDGPU/rv7x0_count3.ll
diff --git a/llvm/test/CodeGen/R600/s_movk_i32.ll → llvm/test/CodeGen/AMDGPU/s_movk_i32.ll b/llvm/test/CodeGen/R600/s_movk_i32.ll → llvm/test/CodeGen/AMDGPU/s_movk_i32.ll
diff --git a/llvm/test/CodeGen/R600/saddo.ll → llvm/test/CodeGen/AMDGPU/saddo.ll b/llvm/test/CodeGen/R600/saddo.ll → llvm/test/CodeGen/AMDGPU/saddo.ll
diff --git a/llvm/test/CodeGen/R600/salu-to-valu.ll → llvm/test/CodeGen/AMDGPU/salu-to-valu.ll b/llvm/test/CodeGen/R600/salu-to-valu.ll → llvm/test/CodeGen/AMDGPU/salu-to-valu.ll
diff --git a/llvm/test/CodeGen/R600/scalar_to_vector.ll → llvm/test/CodeGen/AMDGPU/scalar_to_vector.ll b/llvm/test/CodeGen/R600/scalar_to_vector.ll → llvm/test/CodeGen/AMDGPU/scalar_to_vector.ll
diff --git a/...odeGen/R600/schedule-fs-loop-nested-if.ll → ...eGen/AMDGPU/schedule-fs-loop-nested-if.ll b/...odeGen/R600/schedule-fs-loop-nested-if.ll → ...eGen/AMDGPU/schedule-fs-loop-nested-if.ll
diff --git a/...t/CodeGen/R600/schedule-fs-loop-nested.ll → ...CodeGen/AMDGPU/schedule-fs-loop-nested.ll b/...t/CodeGen/R600/schedule-fs-loop-nested.ll → ...CodeGen/AMDGPU/schedule-fs-loop-nested.ll
diff --git a/llvm/test/CodeGen/R600/schedule-fs-loop.ll → llvm/test/CodeGen/AMDGPU/schedule-fs-loop.ll b/llvm/test/CodeGen/R600/schedule-fs-loop.ll → llvm/test/CodeGen/AMDGPU/schedule-fs-loop.ll
diff --git a/...est/CodeGen/R600/schedule-global-loads.ll → ...t/CodeGen/AMDGPU/schedule-global-loads.ll b/...est/CodeGen/R600/schedule-global-loads.ll → ...t/CodeGen/AMDGPU/schedule-global-loads.ll
diff --git a/llvm/test/CodeGen/R600/schedule-if-2.ll → llvm/test/CodeGen/AMDGPU/schedule-if-2.ll b/llvm/test/CodeGen/R600/schedule-if-2.ll → llvm/test/CodeGen/AMDGPU/schedule-if-2.ll
diff --git a/llvm/test/CodeGen/R600/schedule-if.ll → llvm/test/CodeGen/AMDGPU/schedule-if.ll b/llvm/test/CodeGen/R600/schedule-if.ll → llvm/test/CodeGen/AMDGPU/schedule-if.ll
diff --git a/...CodeGen/R600/schedule-kernel-arg-loads.ll → ...deGen/AMDGPU/schedule-kernel-arg-loads.ll b/...CodeGen/R600/schedule-kernel-arg-loads.ll → ...deGen/AMDGPU/schedule-kernel-arg-loads.ll
diff --git a/...600/schedule-vs-if-nested-loop-failure.ll → ...GPU/schedule-vs-if-nested-loop-failure.ll b/...600/schedule-vs-if-nested-loop-failure.ll → ...GPU/schedule-vs-if-nested-loop-failure.ll
diff --git a/...odeGen/R600/schedule-vs-if-nested-loop.ll → ...eGen/AMDGPU/schedule-vs-if-nested-loop.ll b/...odeGen/R600/schedule-vs-if-nested-loop.ll → ...eGen/AMDGPU/schedule-vs-if-nested-loop.ll
diff --git a/llvm/test/CodeGen/R600/scratch-buffer.ll → llvm/test/CodeGen/AMDGPU/scratch-buffer.ll b/llvm/test/CodeGen/R600/scratch-buffer.ll → llvm/test/CodeGen/AMDGPU/scratch-buffer.ll
diff --git a/llvm/test/CodeGen/R600/sdiv.ll → llvm/test/CodeGen/AMDGPU/sdiv.ll b/llvm/test/CodeGen/R600/sdiv.ll → llvm/test/CodeGen/AMDGPU/sdiv.ll
diff --git a/llvm/test/CodeGen/R600/sdivrem24.ll → llvm/test/CodeGen/AMDGPU/sdivrem24.ll b/llvm/test/CodeGen/R600/sdivrem24.ll → llvm/test/CodeGen/AMDGPU/sdivrem24.ll
diff --git a/llvm/test/CodeGen/R600/sdivrem64.ll → llvm/test/CodeGen/AMDGPU/sdivrem64.ll b/llvm/test/CodeGen/R600/sdivrem64.ll → llvm/test/CodeGen/AMDGPU/sdivrem64.ll
diff --git a/llvm/test/CodeGen/R600/select-i1.ll → llvm/test/CodeGen/AMDGPU/select-i1.ll b/llvm/test/CodeGen/R600/select-i1.ll → llvm/test/CodeGen/AMDGPU/select-i1.ll
diff --git a/llvm/test/CodeGen/R600/select-vectors.ll → llvm/test/CodeGen/AMDGPU/select-vectors.ll b/llvm/test/CodeGen/R600/select-vectors.ll → llvm/test/CodeGen/AMDGPU/select-vectors.ll
diff --git a/llvm/test/CodeGen/R600/select.ll → llvm/test/CodeGen/AMDGPU/select.ll b/llvm/test/CodeGen/R600/select.ll → llvm/test/CodeGen/AMDGPU/select.ll
diff --git a/llvm/test/CodeGen/R600/select64.ll → llvm/test/CodeGen/AMDGPU/select64.ll b/llvm/test/CodeGen/R600/select64.ll → llvm/test/CodeGen/AMDGPU/select64.ll
diff --git a/llvm/test/CodeGen/R600/selectcc-cnd.ll → llvm/test/CodeGen/AMDGPU/selectcc-cnd.ll b/llvm/test/CodeGen/R600/selectcc-cnd.ll → llvm/test/CodeGen/AMDGPU/selectcc-cnd.ll
diff --git a/llvm/test/CodeGen/R600/selectcc-cnde-int.ll → .../test/CodeGen/AMDGPU/selectcc-cnde-int.ll b/llvm/test/CodeGen/R600/selectcc-cnde-int.ll → .../test/CodeGen/AMDGPU/selectcc-cnde-int.ll
diff --git a/...odeGen/R600/selectcc-icmp-select-float.ll → ...eGen/AMDGPU/selectcc-icmp-select-float.ll b/...odeGen/R600/selectcc-icmp-select-float.ll → ...eGen/AMDGPU/selectcc-icmp-select-float.ll
diff --git a/llvm/test/CodeGen/R600/selectcc-opt.ll → llvm/test/CodeGen/AMDGPU/selectcc-opt.ll b/llvm/test/CodeGen/R600/selectcc-opt.ll → llvm/test/CodeGen/AMDGPU/selectcc-opt.ll
diff --git a/llvm/test/CodeGen/R600/selectcc.ll → llvm/test/CodeGen/AMDGPU/selectcc.ll b/llvm/test/CodeGen/R600/selectcc.ll → llvm/test/CodeGen/AMDGPU/selectcc.ll
diff --git a/llvm/test/CodeGen/R600/set-dx10.ll → llvm/test/CodeGen/AMDGPU/set-dx10.ll b/llvm/test/CodeGen/R600/set-dx10.ll → llvm/test/CodeGen/AMDGPU/set-dx10.ll
diff --git a/llvm/test/CodeGen/R600/setcc-equivalent.ll → llvm/test/CodeGen/AMDGPU/setcc-equivalent.ll b/llvm/test/CodeGen/R600/setcc-equivalent.ll → llvm/test/CodeGen/AMDGPU/setcc-equivalent.ll
diff --git a/llvm/test/CodeGen/R600/setcc-opt.ll → llvm/test/CodeGen/AMDGPU/setcc-opt.ll b/llvm/test/CodeGen/R600/setcc-opt.ll → llvm/test/CodeGen/AMDGPU/setcc-opt.ll
diff --git a/llvm/test/CodeGen/R600/setcc.ll → llvm/test/CodeGen/AMDGPU/setcc.ll b/llvm/test/CodeGen/R600/setcc.ll → llvm/test/CodeGen/AMDGPU/setcc.ll
diff --git a/llvm/test/CodeGen/R600/setcc64.ll → llvm/test/CodeGen/AMDGPU/setcc64.ll b/llvm/test/CodeGen/R600/setcc64.ll → llvm/test/CodeGen/AMDGPU/setcc64.ll
diff --git a/llvm/test/CodeGen/R600/seto.ll → llvm/test/CodeGen/AMDGPU/seto.ll b/llvm/test/CodeGen/R600/seto.ll → llvm/test/CodeGen/AMDGPU/seto.ll
diff --git a/llvm/test/CodeGen/R600/setuo.ll → llvm/test/CodeGen/AMDGPU/setuo.ll b/llvm/test/CodeGen/R600/setuo.ll → llvm/test/CodeGen/AMDGPU/setuo.ll
diff --git a/llvm/test/CodeGen/R600/sext-eliminate.ll → llvm/test/CodeGen/AMDGPU/sext-eliminate.ll b/llvm/test/CodeGen/R600/sext-eliminate.ll → llvm/test/CodeGen/AMDGPU/sext-eliminate.ll
diff --git a/llvm/test/CodeGen/R600/sext-in-reg.ll → llvm/test/CodeGen/AMDGPU/sext-in-reg.ll b/llvm/test/CodeGen/R600/sext-in-reg.ll → llvm/test/CodeGen/AMDGPU/sext-in-reg.ll
diff --git a/llvm/test/CodeGen/R600/sgpr-control-flow.ll → .../test/CodeGen/AMDGPU/sgpr-control-flow.ll b/llvm/test/CodeGen/R600/sgpr-control-flow.ll → .../test/CodeGen/AMDGPU/sgpr-control-flow.ll
diff --git a/...deGen/R600/sgpr-copy-duplicate-operand.ll → ...Gen/AMDGPU/sgpr-copy-duplicate-operand.ll b/...deGen/R600/sgpr-copy-duplicate-operand.ll → ...Gen/AMDGPU/sgpr-copy-duplicate-operand.ll
diff --git a/llvm/test/CodeGen/R600/sgpr-copy.ll → llvm/test/CodeGen/AMDGPU/sgpr-copy.ll b/llvm/test/CodeGen/R600/sgpr-copy.ll → llvm/test/CodeGen/AMDGPU/sgpr-copy.ll
diff --git a/llvm/test/CodeGen/R600/shared-op-cycle.ll → llvm/test/CodeGen/AMDGPU/shared-op-cycle.ll b/llvm/test/CodeGen/R600/shared-op-cycle.ll → llvm/test/CodeGen/AMDGPU/shared-op-cycle.ll
diff --git a/llvm/test/CodeGen/R600/shl.ll → llvm/test/CodeGen/AMDGPU/shl.ll b/llvm/test/CodeGen/R600/shl.ll → llvm/test/CodeGen/AMDGPU/shl.ll
diff --git a/llvm/test/CodeGen/R600/shl_add_constant.ll → llvm/test/CodeGen/AMDGPU/shl_add_constant.ll b/llvm/test/CodeGen/R600/shl_add_constant.ll → llvm/test/CodeGen/AMDGPU/shl_add_constant.ll
diff --git a/llvm/test/CodeGen/R600/shl_add_ptr.ll → llvm/test/CodeGen/AMDGPU/shl_add_ptr.ll b/llvm/test/CodeGen/R600/shl_add_ptr.ll → llvm/test/CodeGen/AMDGPU/shl_add_ptr.ll
diff --git a/.../CodeGen/R600/si-annotate-cf-assertion.ll → ...odeGen/AMDGPU/si-annotate-cf-assertion.ll b/.../CodeGen/R600/si-annotate-cf-assertion.ll → ...odeGen/AMDGPU/si-annotate-cf-assertion.ll
diff --git a/llvm/test/CodeGen/R600/si-annotate-cf.ll → llvm/test/CodeGen/AMDGPU/si-annotate-cf.ll b/llvm/test/CodeGen/R600/si-annotate-cf.ll → llvm/test/CodeGen/AMDGPU/si-annotate-cf.ll
diff --git a/llvm/test/CodeGen/R600/si-lod-bias.ll → llvm/test/CodeGen/AMDGPU/si-lod-bias.ll b/llvm/test/CodeGen/R600/si-lod-bias.ll → llvm/test/CodeGen/AMDGPU/si-lod-bias.ll
diff --git a/llvm/test/CodeGen/R600/si-sgpr-spill.ll → llvm/test/CodeGen/AMDGPU/si-sgpr-spill.ll b/llvm/test/CodeGen/R600/si-sgpr-spill.ll → llvm/test/CodeGen/AMDGPU/si-sgpr-spill.ll
diff --git a/llvm/test/CodeGen/R600/si-spill-cf.ll → llvm/test/CodeGen/AMDGPU/si-spill-cf.ll b/llvm/test/CodeGen/R600/si-spill-cf.ll → llvm/test/CodeGen/AMDGPU/si-spill-cf.ll
diff --git a/...deGen/R600/si-triv-disjoint-mem-access.ll → ...Gen/AMDGPU/si-triv-disjoint-mem-access.ll b/...deGen/R600/si-triv-disjoint-mem-access.ll → ...Gen/AMDGPU/si-triv-disjoint-mem-access.ll
diff --git a/llvm/test/CodeGen/R600/si-vector-hang.ll → llvm/test/CodeGen/AMDGPU/si-vector-hang.ll b/llvm/test/CodeGen/R600/si-vector-hang.ll → llvm/test/CodeGen/AMDGPU/si-vector-hang.ll
diff --git a/llvm/test/CodeGen/R600/sign_extend.ll → llvm/test/CodeGen/AMDGPU/sign_extend.ll b/llvm/test/CodeGen/R600/sign_extend.ll → llvm/test/CodeGen/AMDGPU/sign_extend.ll
diff --git a/...R600/simplify-demanded-bits-build-pair.ll → ...DGPU/simplify-demanded-bits-build-pair.ll b/...R600/simplify-demanded-bits-build-pair.ll → ...DGPU/simplify-demanded-bits-build-pair.ll
diff --git a/llvm/test/CodeGen/R600/sint_to_fp.f64.ll → llvm/test/CodeGen/AMDGPU/sint_to_fp.f64.ll b/llvm/test/CodeGen/R600/sint_to_fp.f64.ll → llvm/test/CodeGen/AMDGPU/sint_to_fp.f64.ll
diff --git a/llvm/test/CodeGen/R600/sint_to_fp.ll → llvm/test/CodeGen/AMDGPU/sint_to_fp.ll b/llvm/test/CodeGen/R600/sint_to_fp.ll → llvm/test/CodeGen/AMDGPU/sint_to_fp.ll
diff --git a/llvm/test/CodeGen/R600/smrd.ll → llvm/test/CodeGen/AMDGPU/smrd.ll b/llvm/test/CodeGen/R600/smrd.ll → llvm/test/CodeGen/AMDGPU/smrd.ll
diff --git a/...test/CodeGen/R600/split-scalar-i64-add.ll → ...st/CodeGen/AMDGPU/split-scalar-i64-add.ll b/...test/CodeGen/R600/split-scalar-i64-add.ll → ...st/CodeGen/AMDGPU/split-scalar-i64-add.ll
diff --git a/llvm/test/CodeGen/R600/sra.ll → llvm/test/CodeGen/AMDGPU/sra.ll b/llvm/test/CodeGen/R600/sra.ll → llvm/test/CodeGen/AMDGPU/sra.ll
diff --git a/llvm/test/CodeGen/R600/srem.ll → llvm/test/CodeGen/AMDGPU/srem.ll b/llvm/test/CodeGen/R600/srem.ll → llvm/test/CodeGen/AMDGPU/srem.ll
diff --git a/llvm/test/CodeGen/R600/srl.ll → llvm/test/CodeGen/AMDGPU/srl.ll b/llvm/test/CodeGen/R600/srl.ll → llvm/test/CodeGen/AMDGPU/srl.ll
diff --git a/llvm/test/CodeGen/R600/ssubo.ll → llvm/test/CodeGen/AMDGPU/ssubo.ll b/llvm/test/CodeGen/R600/ssubo.ll → llvm/test/CodeGen/AMDGPU/ssubo.ll
diff --git a/llvm/test/CodeGen/R600/store-barrier.ll → llvm/test/CodeGen/AMDGPU/store-barrier.ll b/llvm/test/CodeGen/R600/store-barrier.ll → llvm/test/CodeGen/AMDGPU/store-barrier.ll
diff --git a/llvm/test/CodeGen/R600/store-v3i32.ll → llvm/test/CodeGen/AMDGPU/store-v3i32.ll b/llvm/test/CodeGen/R600/store-v3i32.ll → llvm/test/CodeGen/AMDGPU/store-v3i32.ll
diff --git a/llvm/test/CodeGen/R600/store-v3i64.ll → llvm/test/CodeGen/AMDGPU/store-v3i64.ll b/llvm/test/CodeGen/R600/store-v3i64.ll → llvm/test/CodeGen/AMDGPU/store-v3i64.ll
diff --git a/llvm/test/CodeGen/R600/store-vector-ptrs.ll → .../test/CodeGen/AMDGPU/store-vector-ptrs.ll b/llvm/test/CodeGen/R600/store-vector-ptrs.ll → .../test/CodeGen/AMDGPU/store-vector-ptrs.ll
diff --git a/llvm/test/CodeGen/R600/store.ll → llvm/test/CodeGen/AMDGPU/store.ll b/llvm/test/CodeGen/R600/store.ll → llvm/test/CodeGen/AMDGPU/store.ll
diff --git a/llvm/test/CodeGen/R600/store.r600.ll → llvm/test/CodeGen/AMDGPU/store.r600.ll b/llvm/test/CodeGen/R600/store.r600.ll → llvm/test/CodeGen/AMDGPU/store.r600.ll
diff --git a/llvm/test/CodeGen/R600/structurize.ll → llvm/test/CodeGen/AMDGPU/structurize.ll b/llvm/test/CodeGen/R600/structurize.ll → llvm/test/CodeGen/AMDGPU/structurize.ll
diff --git a/llvm/test/CodeGen/R600/structurize1.ll → llvm/test/CodeGen/AMDGPU/structurize1.ll b/llvm/test/CodeGen/R600/structurize1.ll → llvm/test/CodeGen/AMDGPU/structurize1.ll
diff --git a/llvm/test/CodeGen/R600/sub.ll → llvm/test/CodeGen/AMDGPU/sub.ll b/llvm/test/CodeGen/R600/sub.ll → llvm/test/CodeGen/AMDGPU/sub.ll
diff --git a/...st/CodeGen/R600/subreg-coalescer-crash.ll → .../CodeGen/AMDGPU/subreg-coalescer-crash.ll b/...st/CodeGen/R600/subreg-coalescer-crash.ll → .../CodeGen/AMDGPU/subreg-coalescer-crash.ll
diff --git a/...est/CodeGen/R600/subreg-eliminate-dead.ll → ...t/CodeGen/AMDGPU/subreg-eliminate-dead.ll b/...est/CodeGen/R600/subreg-eliminate-dead.ll → ...t/CodeGen/AMDGPU/subreg-eliminate-dead.ll
diff --git a/llvm/test/CodeGen/R600/swizzle-export.ll → llvm/test/CodeGen/AMDGPU/swizzle-export.ll b/llvm/test/CodeGen/R600/swizzle-export.ll → llvm/test/CodeGen/AMDGPU/swizzle-export.ll
diff --git a/llvm/test/CodeGen/R600/tex-clause-antidep.ll → ...test/CodeGen/AMDGPU/tex-clause-antidep.ll b/llvm/test/CodeGen/R600/tex-clause-antidep.ll → ...test/CodeGen/AMDGPU/tex-clause-antidep.ll
diff --git a/.../test/CodeGen/R600/texture-input-merge.ll → ...est/CodeGen/AMDGPU/texture-input-merge.ll b/.../test/CodeGen/R600/texture-input-merge.ll → ...est/CodeGen/AMDGPU/texture-input-merge.ll
diff --git a/llvm/test/CodeGen/R600/trunc-cmp-constant.ll → ...test/CodeGen/AMDGPU/trunc-cmp-constant.ll b/llvm/test/CodeGen/R600/trunc-cmp-constant.ll → ...test/CodeGen/AMDGPU/trunc-cmp-constant.ll
diff --git a/...st/CodeGen/R600/trunc-store-f64-to-f16.ll → .../CodeGen/AMDGPU/trunc-store-f64-to-f16.ll b/...st/CodeGen/R600/trunc-store-f64-to-f16.ll → .../CodeGen/AMDGPU/trunc-store-f64-to-f16.ll
diff --git a/llvm/test/CodeGen/R600/trunc-store-i1.ll → llvm/test/CodeGen/AMDGPU/trunc-store-i1.ll b/llvm/test/CodeGen/R600/trunc-store-i1.ll → llvm/test/CodeGen/AMDGPU/trunc-store-i1.ll
diff --git a/...0/trunc-vector-store-assertion-failure.ll → ...U/trunc-vector-store-assertion-failure.ll b/...0/trunc-vector-store-assertion-failure.ll → ...U/trunc-vector-store-assertion-failure.ll
diff --git a/llvm/test/CodeGen/R600/trunc.ll → llvm/test/CodeGen/AMDGPU/trunc.ll b/llvm/test/CodeGen/R600/trunc.ll → llvm/test/CodeGen/AMDGPU/trunc.ll
diff --git a/llvm/test/CodeGen/R600/tti-unroll-prefs.ll → llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll b/llvm/test/CodeGen/R600/tti-unroll-prefs.ll → llvm/test/CodeGen/AMDGPU/tti-unroll-prefs.ll
diff --git a/llvm/test/CodeGen/R600/uaddo.ll → llvm/test/CodeGen/AMDGPU/uaddo.ll b/llvm/test/CodeGen/R600/uaddo.ll → llvm/test/CodeGen/AMDGPU/uaddo.ll
diff --git a/llvm/test/CodeGen/R600/udiv.ll → llvm/test/CodeGen/AMDGPU/udiv.ll b/llvm/test/CodeGen/R600/udiv.ll → llvm/test/CodeGen/AMDGPU/udiv.ll
diff --git a/llvm/test/CodeGen/R600/udivrem.ll → llvm/test/CodeGen/AMDGPU/udivrem.ll b/llvm/test/CodeGen/R600/udivrem.ll → llvm/test/CodeGen/AMDGPU/udivrem.ll
diff --git a/llvm/test/CodeGen/R600/udivrem24.ll → llvm/test/CodeGen/AMDGPU/udivrem24.ll b/llvm/test/CodeGen/R600/udivrem24.ll → llvm/test/CodeGen/AMDGPU/udivrem24.ll
diff --git a/llvm/test/CodeGen/R600/udivrem64.ll → llvm/test/CodeGen/AMDGPU/udivrem64.ll b/llvm/test/CodeGen/R600/udivrem64.ll → llvm/test/CodeGen/AMDGPU/udivrem64.ll
diff --git a/llvm/test/CodeGen/R600/uint_to_fp.f64.ll → llvm/test/CodeGen/AMDGPU/uint_to_fp.f64.ll b/llvm/test/CodeGen/R600/uint_to_fp.f64.ll → llvm/test/CodeGen/AMDGPU/uint_to_fp.f64.ll
diff --git a/llvm/test/CodeGen/R600/uint_to_fp.ll → llvm/test/CodeGen/AMDGPU/uint_to_fp.ll b/llvm/test/CodeGen/R600/uint_to_fp.ll → llvm/test/CodeGen/AMDGPU/uint_to_fp.ll
diff --git a/...test/CodeGen/R600/unaligned-load-store.ll → ...st/CodeGen/AMDGPU/unaligned-load-store.ll b/...test/CodeGen/R600/unaligned-load-store.ll → ...st/CodeGen/AMDGPU/unaligned-load-store.ll
diff --git a/...600/unhandled-loop-condition-assertion.ll → ...GPU/unhandled-loop-condition-assertion.ll b/...600/unhandled-loop-condition-assertion.ll → ...GPU/unhandled-loop-condition-assertion.ll
diff --git a/llvm/test/CodeGen/R600/unroll.ll → llvm/test/CodeGen/AMDGPU/unroll.ll b/llvm/test/CodeGen/R600/unroll.ll → llvm/test/CodeGen/AMDGPU/unroll.ll
diff --git a/llvm/test/CodeGen/R600/unsupported-cc.ll → llvm/test/CodeGen/AMDGPU/unsupported-cc.ll b/llvm/test/CodeGen/R600/unsupported-cc.ll → llvm/test/CodeGen/AMDGPU/unsupported-cc.ll
diff --git a/llvm/test/CodeGen/R600/urecip.ll → llvm/test/CodeGen/AMDGPU/urecip.ll b/llvm/test/CodeGen/R600/urecip.ll → llvm/test/CodeGen/AMDGPU/urecip.ll
diff --git a/llvm/test/CodeGen/R600/urem.ll → llvm/test/CodeGen/AMDGPU/urem.ll b/llvm/test/CodeGen/R600/urem.ll → llvm/test/CodeGen/AMDGPU/urem.ll
diff --git a/...t/CodeGen/R600/use-sgpr-multiple-times.ll → ...CodeGen/AMDGPU/use-sgpr-multiple-times.ll b/...t/CodeGen/R600/use-sgpr-multiple-times.ll → ...CodeGen/AMDGPU/use-sgpr-multiple-times.ll
diff --git a/llvm/test/CodeGen/R600/usubo.ll → llvm/test/CodeGen/AMDGPU/usubo.ll b/llvm/test/CodeGen/R600/usubo.ll → llvm/test/CodeGen/AMDGPU/usubo.ll
diff --git a/llvm/test/CodeGen/R600/v1i64-kernel-arg.ll → llvm/test/CodeGen/AMDGPU/v1i64-kernel-arg.ll b/llvm/test/CodeGen/R600/v1i64-kernel-arg.ll → llvm/test/CodeGen/AMDGPU/v1i64-kernel-arg.ll
diff --git a/llvm/test/CodeGen/R600/v_cndmask.ll → llvm/test/CodeGen/AMDGPU/v_cndmask.ll b/llvm/test/CodeGen/R600/v_cndmask.ll → llvm/test/CodeGen/AMDGPU/v_cndmask.ll
diff --git a/llvm/test/CodeGen/R600/valu-i1.ll → llvm/test/CodeGen/AMDGPU/valu-i1.ll b/llvm/test/CodeGen/R600/valu-i1.ll → llvm/test/CodeGen/AMDGPU/valu-i1.ll
diff --git a/llvm/test/CodeGen/R600/vector-alloca.ll → llvm/test/CodeGen/AMDGPU/vector-alloca.ll b/llvm/test/CodeGen/R600/vector-alloca.ll → llvm/test/CodeGen/AMDGPU/vector-alloca.ll
diff --git a/...est/CodeGen/R600/vertex-fetch-encoding.ll → ...t/CodeGen/AMDGPU/vertex-fetch-encoding.ll b/...est/CodeGen/R600/vertex-fetch-encoding.ll → ...t/CodeGen/AMDGPU/vertex-fetch-encoding.ll
diff --git a/llvm/test/CodeGen/R600/vop-shrink.ll → llvm/test/CodeGen/AMDGPU/vop-shrink.ll b/llvm/test/CodeGen/R600/vop-shrink.ll → llvm/test/CodeGen/AMDGPU/vop-shrink.ll
diff --git a/llvm/test/CodeGen/R600/vselect.ll → llvm/test/CodeGen/AMDGPU/vselect.ll b/llvm/test/CodeGen/R600/vselect.ll → llvm/test/CodeGen/AMDGPU/vselect.ll
diff --git a/llvm/test/CodeGen/R600/vselect64.ll → llvm/test/CodeGen/AMDGPU/vselect64.ll b/llvm/test/CodeGen/R600/vselect64.ll → llvm/test/CodeGen/AMDGPU/vselect64.ll
diff --git a/llvm/test/CodeGen/R600/vtx-fetch-branch.ll → llvm/test/CodeGen/AMDGPU/vtx-fetch-branch.ll b/llvm/test/CodeGen/R600/vtx-fetch-branch.ll → llvm/test/CodeGen/AMDGPU/vtx-fetch-branch.ll
diff --git a/llvm/test/CodeGen/R600/vtx-schedule.ll → llvm/test/CodeGen/AMDGPU/vtx-schedule.ll b/llvm/test/CodeGen/R600/vtx-schedule.ll → llvm/test/CodeGen/AMDGPU/vtx-schedule.ll
diff --git a/llvm/test/CodeGen/R600/wait.ll → llvm/test/CodeGen/AMDGPU/wait.ll b/llvm/test/CodeGen/R600/wait.ll → llvm/test/CodeGen/AMDGPU/wait.ll
diff --git a/...test/CodeGen/R600/work-item-intrinsics.ll → ...st/CodeGen/AMDGPU/work-item-intrinsics.ll b/...test/CodeGen/R600/work-item-intrinsics.ll → ...st/CodeGen/AMDGPU/work-item-intrinsics.ll
diff --git a/...st/CodeGen/R600/wrong-transalu-pos-fix.ll → .../CodeGen/AMDGPU/wrong-transalu-pos-fix.ll b/...st/CodeGen/R600/wrong-transalu-pos-fix.ll → .../CodeGen/AMDGPU/wrong-transalu-pos-fix.ll
diff --git a/llvm/test/CodeGen/R600/xor.ll → llvm/test/CodeGen/AMDGPU/xor.ll b/llvm/test/CodeGen/R600/xor.ll → llvm/test/CodeGen/AMDGPU/xor.ll
diff --git a/llvm/test/CodeGen/R600/zero_extend.ll → llvm/test/CodeGen/AMDGPU/zero_extend.ll b/llvm/test/CodeGen/R600/zero_extend.ll → llvm/test/CodeGen/AMDGPU/zero_extend.ll
diff --git a/llvm/test/CodeGen/R600/lit.local.cfg b/llvm/test/CodeGen/R600/lit.local.cfg
diff --git a/llvm/test/MC/R600/ds-err.s → llvm/test/MC/AMDGPU/ds-err.s b/llvm/test/MC/R600/ds-err.s → llvm/test/MC/AMDGPU/ds-err.s
diff --git a/llvm/test/MC/R600/ds.s → llvm/test/MC/AMDGPU/ds.s b/llvm/test/MC/R600/ds.s → llvm/test/MC/AMDGPU/ds.s
diff --git a/llvm/test/MC/R600/flat.s → llvm/test/MC/AMDGPU/flat.s b/llvm/test/MC/R600/flat.s → llvm/test/MC/AMDGPU/flat.s
diff --git a/llvm/test/MC/AMDGPU/lit.local.cfg b/llvm/test/MC/AMDGPU/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'AMDGPU' in config.root.targets:
+    config.unsupported = True
diff --git a/llvm/test/MC/R600/mubuf.s → llvm/test/MC/AMDGPU/mubuf.s b/llvm/test/MC/R600/mubuf.s → llvm/test/MC/AMDGPU/mubuf.s
diff --git a/llvm/test/MC/R600/smrd.s → llvm/test/MC/AMDGPU/smrd.s b/llvm/test/MC/R600/smrd.s → llvm/test/MC/AMDGPU/smrd.s
diff --git a/llvm/test/MC/R600/sop1-err.s → llvm/test/MC/AMDGPU/sop1-err.s b/llvm/test/MC/R600/sop1-err.s → llvm/test/MC/AMDGPU/sop1-err.s
diff --git a/llvm/test/MC/R600/sop1.s → llvm/test/MC/AMDGPU/sop1.s b/llvm/test/MC/R600/sop1.s → llvm/test/MC/AMDGPU/sop1.s
diff --git a/llvm/test/MC/R600/sop2.s → llvm/test/MC/AMDGPU/sop2.s b/llvm/test/MC/R600/sop2.s → llvm/test/MC/AMDGPU/sop2.s
diff --git a/llvm/test/MC/R600/sopc.s → llvm/test/MC/AMDGPU/sopc.s b/llvm/test/MC/R600/sopc.s → llvm/test/MC/AMDGPU/sopc.s
diff --git a/llvm/test/MC/R600/sopk.s → llvm/test/MC/AMDGPU/sopk.s b/llvm/test/MC/R600/sopk.s → llvm/test/MC/AMDGPU/sopk.s
diff --git a/llvm/test/MC/R600/sopp.s → llvm/test/MC/AMDGPU/sopp.s b/llvm/test/MC/R600/sopp.s → llvm/test/MC/AMDGPU/sopp.s
diff --git a/llvm/test/MC/R600/vop1.s → llvm/test/MC/AMDGPU/vop1.s b/llvm/test/MC/R600/vop1.s → llvm/test/MC/AMDGPU/vop1.s
diff --git a/llvm/test/MC/R600/vop2-err.s → llvm/test/MC/AMDGPU/vop2-err.s b/llvm/test/MC/R600/vop2-err.s → llvm/test/MC/AMDGPU/vop2-err.s
diff --git a/llvm/test/MC/R600/vop2.s → llvm/test/MC/AMDGPU/vop2.s b/llvm/test/MC/R600/vop2.s → llvm/test/MC/AMDGPU/vop2.s
diff --git a/llvm/test/MC/R600/vop3-errs.s → llvm/test/MC/AMDGPU/vop3-errs.s b/llvm/test/MC/R600/vop3-errs.s → llvm/test/MC/AMDGPU/vop3-errs.s
diff --git a/llvm/test/MC/R600/vop3.s → llvm/test/MC/AMDGPU/vop3.s b/llvm/test/MC/R600/vop3.s → llvm/test/MC/AMDGPU/vop3.s
diff --git a/llvm/test/MC/R600/vopc.s → llvm/test/MC/AMDGPU/vopc.s b/llvm/test/MC/R600/vopc.s → llvm/test/MC/AMDGPU/vopc.s
diff --git a/llvm/test/MC/R600/lit.local.cfg b/llvm/test/MC/R600/lit.local.cfg
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		if not 'AMDGPU' in config.root.targets:
		config.unsupported = True