Mesa (master): radeonsi: don't call build_gep0 in si_llvm_emit_ddxy on VI

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 046c199c3af3d329aefd87498c77c014a6bb83a6
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=046c199c3af3d329aefd87498c77c014a6bb83a6

Author: Marek Olšák <marek.ol...@amd.com>
Date:   Sun Oct  2 21:23:26 2016 +0200

radeonsi: don't call build_gep0 in si_llvm_emit_ddxy on VI

Reviewed-by: Nicolai Hähnle <nicolai.haeh...@amd.com>
Reviewed-by: Edward O'Callaghan <funfunc...@folklore1984.net>

---

 src/gallium/drivers/radeonsi/si_shader.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 67ab16b..414810e 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -5014,9 +5014,10 @@ static void si_llvm_emit_ddxy(
        unsigned c;
        int idx;
        unsigned mask;
+       bool has_ds_bpermute = HAVE_LLVM >= 0x0309 &&
+                              ctx->screen->b.chip_class >= VI;
 
        thread_id = get_thread_id(ctx);;
-       store_ptr = build_gep0(ctx, ctx->lds, thread_id);
 
        if (opcode == TGSI_OPCODE_DDX_FINE)
                mask = TID_MASK_LEFT;
@@ -5027,13 +5028,17 @@ static void si_llvm_emit_ddxy(
 
        tl_tid = LLVMBuildAnd(gallivm->builder, thread_id,
                                lp_build_const_int32(gallivm, mask), "");
-       load_ptr0 = build_gep0(ctx, ctx->lds, tl_tid);
 
        /* for DDX we want to next X pixel, DDY next Y pixel. */
        idx = (opcode == TGSI_OPCODE_DDX || opcode == TGSI_OPCODE_DDX_FINE) ? 1 
: 2;
        trbl_tid = LLVMBuildAdd(gallivm->builder, tl_tid,
                                  lp_build_const_int32(gallivm, idx), "");
-       load_ptr1 = build_gep0(ctx, ctx->lds, trbl_tid);
+
+       if (!has_ds_bpermute) {
+               store_ptr = build_gep0(ctx, ctx->lds, thread_id);
+               load_ptr0 = build_gep0(ctx, ctx->lds, tl_tid);
+               load_ptr1 = build_gep0(ctx, ctx->lds, trbl_tid);
+       }
 
        for (c = 0; c < 4; ++c) {
                unsigned i;
@@ -5054,8 +5059,7 @@ static void si_llvm_emit_ddxy(
                                lp_build_emit_fetch(bld_base, inst, 0, c),
                                                ctx->i32, "");
 
-               if ((HAVE_LLVM >= 0x0309) && ctx->screen->b.family >= 
CHIP_TONGA) {
-
+               if (has_ds_bpermute) {
                        args[0] = LLVMBuildMul(gallivm->builder, tl_tid,
                                         lp_build_const_int32(gallivm, 4), "");
                        args[1] = val;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit