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

amd/common: import get_{load,store}_intr_attribs() from RadeonSI

Browse Source 
v2: move those helpers to the header and use static inline

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> (v1)
This commit is contained in:
Samuel Pitoiset
2018-01-10 12:57:19 +01:00
parent b391fb26df
commit 7239e265eb
3 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -983,11 +983,7 @@ ac_build_buffer_load(struct ac_llvm_context *ctx,
return ac_build_intrinsic(ctx, name, types[func], args, return ac_build_intrinsic(ctx, name, types[func], args,
ARRAY_SIZE(args), ARRAY_SIZE(args),
/* READNONE means writes can't affect it, while ac_get_load_intr_attribs(can_speculate));
* READONLY means that writes can affect it. */
can_speculate && HAVE_LLVM >= 0x0400 ?
AC_FUNC_ATTR_READNONE :
AC_FUNC_ATTR_READONLY);
} }
LLVMValueRef ac_build_buffer_load_format(struct ac_llvm_context *ctx, LLVMValueRef ac_build_buffer_load_format(struct ac_llvm_context *ctx,
@@ -1007,11 +1003,7 @@ LLVMValueRef ac_build_buffer_load_format(struct ac_llvm_context *ctx,
return ac_build_intrinsic(ctx, return ac_build_intrinsic(ctx,
"llvm.amdgcn.buffer.load.format.v4f32", "llvm.amdgcn.buffer.load.format.v4f32",
ctx->v4f32, args, ARRAY_SIZE(args), ctx->v4f32, args, ARRAY_SIZE(args),
/* READNONE means writes can't affect it, while ac_get_load_intr_attribs(can_speculate));
* READONLY means that writes can affect it. */
can_speculate && HAVE_LLVM >= 0x0400 ?
AC_FUNC_ATTR_READNONE :
AC_FUNC_ATTR_READONLY);
} }
/** /**

18
src/amd/common/ac_llvm_util.h
View File

@@ -81,6 +81,24 @@ void
ac_llvm_add_target_dep_function_attr(LLVMValueRef F, ac_llvm_add_target_dep_function_attr(LLVMValueRef F,
const char *name, int value); const char *name, int value);
static inline unsigned
ac_get_load_intr_attribs(bool can_speculate)
{
/* READNONE means writes can't affect it, while READONLY means that
* writes can affect it. */
return can_speculate && HAVE_LLVM >= 0x0400 ?
AC_FUNC_ATTR_READNONE :
AC_FUNC_ATTR_READONLY;
}
static inline unsigned
ac_get_store_intr_attribs(bool writeonly_memory)
{
return writeonly_memory && HAVE_LLVM >= 0x0400 ?
AC_FUNC_ATTR_INACCESSIBLE_MEM_ONLY :
AC_FUNC_ATTR_WRITEONLY;
}
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

26
src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c
View File

@@ -390,22 +390,6 @@ static void load_fetch_args(
} }
} }
static unsigned get_load_intr_attribs(bool can_speculate)
{
/* READNONE means writes can't affect it, while READONLY means that
* writes can affect it. */
return can_speculate && HAVE_LLVM >= 0x0400 ?
LP_FUNC_ATTR_READNONE :
LP_FUNC_ATTR_READONLY;
}
static unsigned get_store_intr_attribs(bool writeonly_memory)
{
return writeonly_memory && HAVE_LLVM >= 0x0400 ?
LP_FUNC_ATTR_INACCESSIBLE_MEM_ONLY :
LP_FUNC_ATTR_WRITEONLY;
}
static void load_emit_buffer(struct si_shader_context *ctx, static void load_emit_buffer(struct si_shader_context *ctx,
struct lp_build_emit_data *emit_data, struct lp_build_emit_data *emit_data,
bool can_speculate, bool allow_smem) bool can_speculate, bool allow_smem)
@@ -586,7 +570,7 @@ static void load_emit(
lp_build_intrinsic( lp_build_intrinsic(
builder, "llvm.amdgcn.buffer.load.format.v4f32", emit_data->dst_type, builder, "llvm.amdgcn.buffer.load.format.v4f32", emit_data->dst_type,
emit_data->args, emit_data->arg_count, emit_data->args, emit_data->arg_count,
get_load_intr_attribs(can_speculate)); ac_get_load_intr_attribs(can_speculate));
} else { } else {
ac_get_image_intr_name("llvm.amdgcn.image.load", ac_get_image_intr_name("llvm.amdgcn.image.load",
emit_data->dst_type, /* vdata */ emit_data->dst_type, /* vdata */
@@ -598,7 +582,7 @@ static void load_emit(
lp_build_intrinsic( lp_build_intrinsic(
builder, intrinsic_name, emit_data->dst_type, builder, intrinsic_name, emit_data->dst_type,
emit_data->args, emit_data->arg_count, emit_data->args, emit_data->arg_count,
get_load_intr_attribs(can_speculate)); ac_get_load_intr_attribs(can_speculate));
} }
} }
@@ -734,7 +718,7 @@ static void store_emit_buffer(
lp_build_intrinsic( lp_build_intrinsic(
builder, intrinsic_name, emit_data->dst_type, builder, intrinsic_name, emit_data->dst_type,
emit_data->args, emit_data->arg_count, emit_data->args, emit_data->arg_count,
get_store_intr_attribs(writeonly_memory)); ac_get_store_intr_attribs(writeonly_memory));
} }
} }
@@ -798,7 +782,7 @@ static void store_emit(
builder, "llvm.amdgcn.buffer.store.format.v4f32", builder, "llvm.amdgcn.buffer.store.format.v4f32",
emit_data->dst_type, emit_data->args, emit_data->dst_type, emit_data->args,
emit_data->arg_count, emit_data->arg_count,
get_store_intr_attribs(writeonly_memory)); ac_get_store_intr_attribs(writeonly_memory));
} else { } else {
ac_get_image_intr_name("llvm.amdgcn.image.store", ac_get_image_intr_name("llvm.amdgcn.image.store",
LLVMTypeOf(emit_data->args[0]), /* vdata */ LLVMTypeOf(emit_data->args[0]), /* vdata */
@@ -810,7 +794,7 @@ static void store_emit(
lp_build_intrinsic( lp_build_intrinsic(
builder, intrinsic_name, emit_data->dst_type, builder, intrinsic_name, emit_data->dst_type,
emit_data->args, emit_data->arg_count, emit_data->args, emit_data->arg_count,
get_store_intr_attribs(writeonly_memory)); ac_get_store_intr_attribs(writeonly_memory));
} }
} }