OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radeonsi: set readnone on reads from read-only memory

Browse Source
This commit is contained in:
Marek Olšák
2017-02-24 17:16:28 +01:00
parent 25c7969a5a
commit e729dc7c46
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/amd/common/ac_llvm_build.c
View File

@@ -619,7 +619,8 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
LLVMValueRef soffset, LLVMValueRef soffset,
unsigned inst_offset, unsigned inst_offset,
unsigned glc, unsigned glc,
unsigned slc) unsigned slc,
bool readonly_memory)
{ {
unsigned func = CLAMP(num_channels, 1, 3) - 1; unsigned func = CLAMP(num_channels, 1, 3) - 1;
@@ -651,7 +652,13 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
type_names[func]); type_names[func]);
return ac_emit_llvm_intrinsic(ctx, name, types[func], args, 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 { } else {
LLVMValueRef args[] = { LLVMValueRef args[] = {
LLVMBuildBitCast(ctx->builder, rsrc, ctx->v16i8, ""), LLVMBuildBitCast(ctx->builder, rsrc, ctx->v16i8, ""),

3
src/amd/common/ac_llvm_build.h
View File

@@ -155,7 +155,8 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
LLVMValueRef soffset, LLVMValueRef soffset,
unsigned inst_offset, unsigned inst_offset,
unsigned glc, unsigned glc,
unsigned slc); unsigned slc,
bool readonly_memory);
LLVMValueRef LLVMValueRef
ac_get_thread_id(struct ac_llvm_context *ctx); ac_get_thread_id(struct ac_llvm_context *ctx);

20
src/gallium/drivers/radeonsi/si_shader.c
View File

@@ -826,7 +826,7 @@ static LLVMValueRef get_tcs_tes_buffer_address_from_reg(
static LLVMValueRef buffer_load(struct lp_build_tgsi_context *bld_base, static LLVMValueRef buffer_load(struct lp_build_tgsi_context *bld_base,
enum tgsi_opcode_type type, unsigned swizzle, enum tgsi_opcode_type type, unsigned swizzle,
LLVMValueRef buffer, LLVMValueRef offset, LLVMValueRef buffer, LLVMValueRef offset,
LLVMValueRef base) LLVMValueRef base, bool readonly_memory)
{ {
struct si_shader_context *ctx = si_shader_context(bld_base); struct si_shader_context *ctx = si_shader_context(bld_base);
struct gallivm_state *gallivm = bld_base->base.gallivm; 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) { if (swizzle == ~0) {
value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset, 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, ""); return LLVMBuildBitCast(gallivm->builder, value, vec_type, "");
} }
if (!tgsi_type_is_64bit(type)) { if (!tgsi_type_is_64bit(type)) {
value = ac_build_buffer_load(&ctx->ac, buffer, 4, NULL, base, offset, 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, ""); value = LLVMBuildBitCast(gallivm->builder, value, vec_type, "");
return LLVMBuildExtractElement(gallivm->builder, value, 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, 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, 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); 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); base = LLVMGetParam(ctx->main_fn, ctx->param_oc_lds);
addr = get_tcs_tes_buffer_address_from_reg(ctx, NULL, reg); 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, 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); soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle) * 256, 0);
value = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1, uint->zero, 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)) { if (tgsi_type_is_64bit(type)) {
LLVMValueRef value2; LLVMValueRef value2;
soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle + 1) * 256, 0); soffset = LLVMConstInt(ctx->i32, (param * 4 + swizzle + 1) * 256, 0);
value2 = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1, value2 = ac_build_buffer_load(&ctx->ac, ctx->esgs_ring, 1,
uint->zero, vtx_offset, soffset, uint->zero, vtx_offset, soffset,
0, 1, 0); 0, 1, 0, true);
return si_llvm_emit_fetch_64bit(bld_base, type, return si_llvm_emit_fetch_64bit(bld_base, type,
value, value2); value, value2);
} }
@@ -1530,7 +1530,7 @@ static void declare_system_value(
lp_build_const_int32(gallivm, param)); lp_build_const_int32(gallivm, param));
value = buffer_load(&radeon_bld->bld_base, TGSI_TYPE_FLOAT, value = buffer_load(&radeon_bld->bld_base, TGSI_TYPE_FLOAT,
~0, buffer, base, addr); ~0, buffer, base, addr, true);
break; break;
} }
@@ -6216,7 +6216,7 @@ si_generate_gs_copy_shader(struct si_screen *sscreen,
ac_build_buffer_load(&ctx.ac, ac_build_buffer_load(&ctx.ac,
ctx.gsvs_ring[0], 1, ctx.gsvs_ring[0], 1,
uint->zero, voffset, uint->zero, voffset,
soffset, 0, 1, 1); soffset, 0, 1, 1, true);
} }
} }