radeonsi: set readnone on reads from read-only memory

diff --git a/src/amd/common/ac_llvm_build.c b/src/amd/common/ac_llvm_build.c
index 42965b6a544fbc8fe6b7a9cb7e8e40fea1dba467..f0ab9cb1367a4b57ab7e272ba26a94239f8a6aa8 100644 (file)
--- a/src/amd/common/ac_llvm_build.c
+++ b/src/amd/common/ac_llvm_build.c
@@ -619,7 +619,8 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
                     LLVMValueRef soffset,
                     unsigned inst_offset,
                     unsigned glc,
-                    unsigned slc)
+                    unsigned slc,
+                    bool readonly_memory)
 {
        unsigned func = CLAMP(num_channels, 1, 3) - 1;
 
@@ -651,7 +652,13 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
                         type_names[func]);
 
                return ac_emit_llvm_intrinsic(ctx, name, types[func], args,
-                                             ARRAY_SIZE(args), AC_FUNC_ATTR_READONLY);
+                                             ARRAY_SIZE(args),
+                                             /* READNONE means writes can't
+                                              * affect it, while READONLY means
+                                              * that writes can affect it. */
+                                             readonly_memory ?
+                                                     AC_FUNC_ATTR_READNONE :
+                                                     AC_FUNC_ATTR_READONLY);
        } else {
                LLVMValueRef args[] = {
                        LLVMBuildBitCast(ctx->builder, rsrc, ctx->v16i8, ""),

diff --git a/src/amd/common/ac_llvm_build.h b/src/amd/common/ac_llvm_build.h
index e6bb90fd7abafc7adfb878a69bbcfd8944b0425f..e6e4e434e2ec9fe7b8fea40f6c40307bd4b21e00 100644 (file)
--- a/src/amd/common/ac_llvm_build.h
+++ b/src/amd/common/ac_llvm_build.h
@@ -155,7 +155,8 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
                     LLVMValueRef soffset,
                     unsigned inst_offset,
                     unsigned glc,
-                    unsigned slc);
+                    unsigned slc,
+                    bool readonly_memory);
 
 LLVMValueRef
 ac_get_thread_id(struct ac_llvm_context *ctx);

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 6dda13ee3ca53609a45b74c0da95e8d0e129838e..48b4a94b3c98e63cf9ed668e211268b6292380e9 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -826,7 +826,7 @@ static LLVMValueRef get_tcs_tes_buffer_address_from_reg(
 static LLVMValueRef buffer_load(struct lp_build_tgsi_context *bld_base,
                                 enum tgsi_opcode_type type, unsigned swizzle,
                                 LLVMValueRef buffer, LLVMValueRef offset,
-                                LLVMValueRef base)
+                                LLVMValueRef base, bool readonly_memory)
 {
        struct si_shader_context *ctx = si_shader_context(bld_base);
        struct gallivm_state *gallivm = bld_base->base.gallivm;
@@ -836,14 +836,14 @@ static LLVMValueRef buffer_load(struct lp_build_tgsi_context *bld_base,
 
        if (swizzle == ~0) {
                value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset,
-                                            0, 1, 0);
+                                            0, 1, 0, readonly_memory);
 
                return LLVMBuildBitCast(gallivm->builder, value, vec_type, "");
        }
 
        if (!tgsi_type_is_64bit(type)) {
                value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset,
-                                            0, 1, 0);
+                                            0, 1, 0, readonly_memory);
 
                value = LLVMBuildBitCast(gallivm->builder, value, vec_type, "");
                return LLVMBuildExtractElement(gallivm->builder, value,
@@ -851,10 +851,10 @@ static LLVMValueRef buffer_load(struct lp_build_tgsi_context *bld_base,
        }
 
        value = ac_build_buffer_load(&ctx->ac, buffer, 1, NULL, base, offset,
-                                 swizzle * 4, 1, 0);
+                                 swizzle * 4, 1, 0, readonly_memory);
 
        value2 = ac_build_buffer_load(&ctx->ac, buffer, 1, NULL, base, offset,
-                                  swizzle * 4 + 4, 1, 0);
+                                  swizzle * 4 + 4, 1, 0, readonly_memory);
 
        return si_llvm_emit_fetch_64bit(bld_base, type, value, value2);
 }
@@ -974,7 +974,7 @@ static LLVMValueRef fetch_input_tes(
        base = LLVMGetParam(ctx->main_fn, ctx->param_oc_lds);
        addr = get_tcs_tes_buffer_address_from_reg(ctx, NULL, reg);
 
-       return buffer_load(bld_base, type, swizzle, buffer, base, addr);
+       return buffer_load(bld_base, type, swizzle, buffer, base, addr, true);
 }
 
 static void store_output_tcs(struct lp_build_tgsi_context *bld_base,
@@ -1113,14 +1113,14 @@ static LLVMValueRef fetch_input_gs(
        soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle) * 256, 0);
 
        value = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1, uint->zero,
-                                    vtx_offset, soffset, 0, 1, 0);
+                                    vtx_offset, soffset, 0, 1, 0, true);
        if (tgsi_type_is_64bit(type)) {
                LLVMValueRef value2;
                soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle + 1) * 256, 0);
 
                value2 = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1,
                                              uint->zero, vtx_offset, soffset,
-                                             0, 1, 0);
+                                             0, 1, 0, true);
                return si_llvm_emit_fetch_64bit(bld_base, type,
                                                value, value2);
        }
@@ -1530,7 +1530,7 @@ static void declare_system_value(
                                          lp_build_const_int32(gallivm, param));
 
                value = buffer_load(&radeon_bld->bld_base, TGSI_TYPE_FLOAT,
-                                   ~0, buffer, base, addr);
+                                   ~0, buffer, base, addr, true);
 
                break;
        }
@@ -6216,7 +6216,7 @@ si_generate_gs_copy_shader(struct si_screen *sscreen,
                                        ac_build_buffer_load(&ctx.ac,
                                                             ctx.gsvs_ring[0], 1,
                                                             uint->zero, voffset,
-                                                            soffset, 0, 1, 1);
+                                                            soffset, 0, 1, 1, true);
                        }
                }