1 files changed, 18 insertions, 13 deletions

diff --git a/llvm/lib/Target/AMDGPU/R600Intrinsics.td b/llvm/lib/Target/AMDGPU/R600Intrinsics.td
index eeb6ca2c7b6..5fb8d412ae5 100644
--- a/llvm/lib/Target/AMDGPU/R600Intrinsics.td
+++ b/llvm/lib/Target/AMDGPU/R600Intrinsics.td
@@ -11,6 +11,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// FIXME: Should migrate to using TargetPrefix that matches triple arch name.
 let TargetPrefix = "R600", isTarget = 1 in {
   class TextureIntrinsicFloatInput :
     Intrinsic<[llvm_v4f32_ty], [
@@ -39,25 +40,16 @@ let TargetPrefix = "R600", isTarget = 1 in {
       llvm_i32_ty // coord_type_w
     ], [IntrNoMem]>;
 
+  def int_R600_ldptr : TextureIntrinsicInt32Input;
+
   def int_R600_interp_const :
     Intrinsic<[llvm_v4f32_ty], [llvm_i32_ty], [IntrNoMem]>;
-def int_R600_interp_xy :
+  def int_R600_interp_xy :
     Intrinsic<[llvm_v2f32_ty], [llvm_i32_ty, llvm_float_ty, llvm_float_ty], [IntrNoMem]>;
-def int_R600_interp_zw :
+  def int_R600_interp_zw :
     Intrinsic<[llvm_v2f32_ty], [llvm_i32_ty, llvm_float_ty, llvm_float_ty], [IntrNoMem]>;
   def int_R600_load_texbuf :
     Intrinsic<[llvm_v4f32_ty], [llvm_i32_ty, llvm_i32_ty], [IntrNoMem]>;
-  def int_R600_tex : TextureIntrinsicFloatInput;
-  def int_R600_texc : TextureIntrinsicFloatInput;
-  def int_R600_txl : TextureIntrinsicFloatInput;
-  def int_R600_txlc : TextureIntrinsicFloatInput;
-  def int_R600_txb : TextureIntrinsicFloatInput;
-  def int_R600_txbc : TextureIntrinsicFloatInput;
-  def int_R600_txf : TextureIntrinsicInt32Input;
-  def int_R600_ldptr : TextureIntrinsicInt32Input;
-  def int_R600_txq : TextureIntrinsicInt32Input;
-  def int_R600_ddx : TextureIntrinsicFloatInput;
-  def int_R600_ddy : TextureIntrinsicFloatInput;
   def int_R600_store_swizzle :
     Intrinsic<[], [llvm_v4f32_ty, llvm_i32_ty, llvm_i32_ty], []>;
   def int_R600_store_stream_output :
@@ -68,4 +60,17 @@ def int_R600_interp_zw :
       Intrinsic<[], [llvm_float_ty], []>;
   def int_R600_store_dummy :
       Intrinsic<[], [llvm_i32_ty], []>;
+} // End TargetPrefix = "R600", isTarget = 1
+
+let TargetPrefix = "r600", isTarget = 1 in {
+  def int_r600_tex : TextureIntrinsicFloatInput;
+  def int_r600_texc : TextureIntrinsicFloatInput;
+  def int_r600_txl : TextureIntrinsicFloatInput;
+  def int_r600_txlc : TextureIntrinsicFloatInput;
+  def int_r600_txb : TextureIntrinsicFloatInput;
+  def int_r600_txbc : TextureIntrinsicFloatInput;
+  def int_r600_txf : TextureIntrinsicInt32Input;
+  def int_r600_txq : TextureIntrinsicInt32Input;
+  def int_r600_ddx : TextureIntrinsicFloatInput;
+  def int_r600_ddy : TextureIntrinsicFloatInput;
 }