Re: [Mesa-dev] [PATCH 2/3 v2] R600/SI: Take target parameter for sample intrinsics.

[Christian König]

On 16.01.2013 15:27, Michel Dänzer wrote:

From: Michel Dänzer <michel.daen...@amd.com>


Signed-off-by: Michel Dänzer <michel.daen...@amd.com>
---

v2: Leave the target parameter unnamed to prevent noisy if harmless
build error messages.

For both patches:

Reviewed-by Christian König <christian.koe...@amd.com>

  lib/Target/R600/SIInstructions.td |    6 +++---
  lib/Target/R600/SIIntrinsics.td   |    2 +-
  2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Target/R600/SIInstructions.td 
b/lib/Target/R600/SIInstructions.td
index cac42da..0f9d572 100644
--- a/lib/Target/R600/SIInstructions.td
+++ b/lib/Target/R600/SIInstructions.td
@@ -1186,21 +1186,21 @@ def : Pat <

/* int_SI_sample */

  def : Pat <
-  (int_SI_sample imm:$writemask, VReg_128:$coord, SReg_256:$rsrc, 
SReg_128:$sampler),
+  (int_SI_sample imm:$writemask, VReg_128:$coord, SReg_256:$rsrc, 
SReg_128:$sampler, imm),
    (IMAGE_SAMPLE imm:$writemask, 0, 0, 0, 0, 0, 0, 0, VReg_128:$coord,
                  SReg_256:$rsrc, SReg_128:$sampler)
  >;

/* int_SI_sample_lod */

  def : Pat <
-  (int_SI_sample_lod imm:$writemask, VReg_128:$coord, SReg_256:$rsrc, 
SReg_128:$sampler),
+  (int_SI_sample_lod imm:$writemask, VReg_128:$coord, SReg_256:$rsrc, 
SReg_128:$sampler, imm),
    (IMAGE_SAMPLE_L imm:$writemask, 0, 0, 0, 0, 0, 0, 0, VReg_128:$coord,
                    SReg_256:$rsrc, SReg_128:$sampler)
  >;

/* int_SI_sample_bias */

  def : Pat <
-  (int_SI_sample_bias imm:$writemask, VReg_128:$coord, SReg_256:$rsrc, 
SReg_128:$sampler),
+  (int_SI_sample_bias imm:$writemask, VReg_128:$coord, SReg_256:$rsrc, 
SReg_128:$sampler, imm),
    (IMAGE_SAMPLE_B imm:$writemask, 0, 0, 0, 0, 0, 0, 0, VReg_128:$coord,
                    SReg_256:$rsrc, SReg_128:$sampler)
  >;
diff --git a/lib/Target/R600/SIIntrinsics.td b/lib/Target/R600/SIIntrinsics.td
index 0d1064e..4393144 100644
--- a/lib/Target/R600/SIIntrinsics.td
+++ b/lib/Target/R600/SIIntrinsics.td
@@ -22,7 +22,7 @@ let TargetPrefix = "SI", isTarget = 1 in {
    def int_SI_vs_load_input : Intrinsic <[llvm_v4f32_ty], [llvm_v4i32_ty, 
llvm_i16_ty, llvm_i32_ty], [IntrReadMem]> ;
    def int_SI_wqm : Intrinsic <[], [], []>;

- class Sample : Intrinsic <[llvm_v4f32_ty], [llvm_i32_ty, llvm_v4f32_ty, llvm_v8i32_ty, llvm_v4i32_ty], [IntrReadMem]>;

+  class Sample : Intrinsic <[llvm_v4f32_ty], [llvm_i32_ty, llvm_v4f32_ty, 
llvm_v8i32_ty, llvm_v4i32_ty, llvm_i32_ty], [IntrReadMem]>;

def int_SI_sample : Sample;

    def int_SI_sample_bias : Sample;

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev