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

ac/llvm: rename tbuffer -> buffer where tbuffer instructions are not generated

Browse Source 
Reviewed-by: Mihai Preda <mhpreda@gmail.com>
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15966>
This commit is contained in:
Marek Olšák
2022-04-15 02:16:07 -04:00
committed by Marge Bot
parent 6698753cdb
commit 159b28ad36
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/amd/llvm/ac_llvm_build.c
View File

@@ -1331,17 +1331,17 @@ LLVMValueRef ac_build_struct_tbuffer_load(struct ac_llvm_context *ctx, LLVMValue
nfmt, cache_policy, can_speculate, true); nfmt, cache_policy, can_speculate, true);
} }
LLVMValueRef ac_build_tbuffer_load_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef ac_build_buffer_load_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef voffset, LLVMValueRef soffset, LLVMValueRef voffset, LLVMValueRef soffset,
unsigned cache_policy) unsigned cache_policy)
{ {
return ac_build_buffer_load_common(ctx, rsrc, NULL, voffset, soffset, 1, ctx->i16, return ac_build_buffer_load_common(ctx, rsrc, NULL, voffset, soffset, 1, ctx->i16,
cache_policy, false, false, false); cache_policy, false, false, false);
} }
LLVMValueRef ac_build_tbuffer_load_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef ac_build_buffer_load_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef voffset, LLVMValueRef soffset, LLVMValueRef voffset, LLVMValueRef soffset,
unsigned cache_policy) unsigned cache_policy)
{ {
return ac_build_buffer_load_common(ctx, rsrc, NULL, voffset, soffset, 1, ctx->i8, cache_policy, return ac_build_buffer_load_common(ctx, rsrc, NULL, voffset, soffset, 1, ctx->i8, cache_policy,
false, false, false); false, false, false);
@@ -1638,17 +1638,17 @@ LLVMValueRef ac_build_opencoded_load_format(struct ac_llvm_context *ctx, unsigne
return ac_build_gather_values(ctx, loads, 4); return ac_build_gather_values(ctx, loads, 4);
} }
void ac_build_tbuffer_store_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc, void ac_build_buffer_store_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef vdata, LLVMValueRef voffset, LLVMValueRef soffset, LLVMValueRef vdata, LLVMValueRef voffset, LLVMValueRef soffset,
unsigned cache_policy) unsigned cache_policy)
{ {
vdata = LLVMBuildBitCast(ctx->builder, vdata, ctx->i16, ""); vdata = LLVMBuildBitCast(ctx->builder, vdata, ctx->i16, "");
ac_build_buffer_store_common(ctx, rsrc, vdata, NULL, voffset, soffset, cache_policy, false); ac_build_buffer_store_common(ctx, rsrc, vdata, NULL, voffset, soffset, cache_policy, false);
} }
void ac_build_tbuffer_store_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata, void ac_build_buffer_store_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata,
LLVMValueRef voffset, LLVMValueRef soffset, unsigned cache_policy) LLVMValueRef voffset, LLVMValueRef soffset, unsigned cache_policy)
{ {
vdata = LLVMBuildBitCast(ctx->builder, vdata, ctx->i8, ""); vdata = LLVMBuildBitCast(ctx->builder, vdata, ctx->i8, "");

20
src/amd/llvm/ac_llvm_build.h
View File

@@ -271,14 +271,14 @@ LLVMValueRef ac_build_buffer_load_format(struct ac_llvm_context *ctx, LLVMValueR
unsigned num_channels, unsigned cache_policy, unsigned num_channels, unsigned cache_policy,
bool can_speculate, bool d16, bool tfe); bool can_speculate, bool d16, bool tfe);
LLVMValueRef ac_build_tbuffer_load_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef ac_build_buffer_load_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef voffset, LLVMValueRef soffset,
unsigned cache_policy);
LLVMValueRef ac_build_tbuffer_load_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef voffset, LLVMValueRef soffset, LLVMValueRef voffset, LLVMValueRef soffset,
unsigned cache_policy); unsigned cache_policy);
LLVMValueRef ac_build_buffer_load_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef voffset, LLVMValueRef soffset,
unsigned cache_policy);
LLVMValueRef ac_build_struct_tbuffer_load(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef ac_build_struct_tbuffer_load(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef vindex, LLVMValueRef voffset, LLVMValueRef vindex, LLVMValueRef voffset,
LLVMValueRef soffset, unsigned num_channels, LLVMValueRef soffset, unsigned num_channels,
@@ -292,12 +292,12 @@ LLVMValueRef ac_build_opencoded_load_format(struct ac_llvm_context *ctx, unsigne
LLVMValueRef soffset, unsigned cache_policy, LLVMValueRef soffset, unsigned cache_policy,
bool can_speculate); bool can_speculate);
void ac_build_tbuffer_store_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc, void ac_build_buffer_store_short(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
LLVMValueRef vdata, LLVMValueRef voffset, LLVMValueRef soffset, LLVMValueRef vdata, LLVMValueRef voffset, LLVMValueRef soffset,
unsigned cache_policy); unsigned cache_policy);
void ac_build_tbuffer_store_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata, void ac_build_buffer_store_byte(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata,
LLVMValueRef voffset, LLVMValueRef soffset, unsigned cache_policy); LLVMValueRef voffset, LLVMValueRef soffset, unsigned cache_policy);
void ac_set_range_metadata(struct ac_llvm_context *ctx, LLVMValueRef value, unsigned lo, void ac_set_range_metadata(struct ac_llvm_context *ctx, LLVMValueRef value, unsigned lo,
unsigned hi); unsigned hi);

8
src/amd/llvm/ac_nir_to_llvm.c
View File

@@ -1864,9 +1864,9 @@ static void visit_store_ssbo(struct ac_nir_context *ctx, nir_intrinsic_instr *in
LLVMConstInt(ctx->ac.i32, start * elem_size_bytes, false), ""); LLVMConstInt(ctx->ac.i32, start * elem_size_bytes, false), "");
if (num_bytes == 1) { if (num_bytes == 1) {
ac_build_tbuffer_store_byte(&ctx->ac, rsrc, data, offset, ctx->ac.i32_0, cache_policy); ac_build_buffer_store_byte(&ctx->ac, rsrc, data, offset, ctx->ac.i32_0, cache_policy);
} else if (num_bytes == 2) { } else if (num_bytes == 2) {
ac_build_tbuffer_store_short(&ctx->ac, rsrc, data, offset, ctx->ac.i32_0, cache_policy); ac_build_buffer_store_short(&ctx->ac, rsrc, data, offset, ctx->ac.i32_0, cache_policy);
} else { } else {
switch (num_bytes) { switch (num_bytes) {
case 16: /* v4f32 */ case 16: /* v4f32 */
@@ -2085,10 +2085,10 @@ static LLVMValueRef visit_load_buffer(struct ac_nir_context *ctx, nir_intrinsic_
LLVMValueRef ret; LLVMValueRef ret;
if (load_bytes == 1) { if (load_bytes == 1) {
ret = ac_build_tbuffer_load_byte(&ctx->ac, rsrc, voffset, ctx->ac.i32_0, ret = ac_build_buffer_load_byte(&ctx->ac, rsrc, voffset, ctx->ac.i32_0,
cache_policy); cache_policy);
} else if (load_bytes == 2) { } else if (load_bytes == 2) {
ret = ac_build_tbuffer_load_short(&ctx->ac, rsrc, voffset, ctx->ac.i32_0, ret = ac_build_buffer_load_short(&ctx->ac, rsrc, voffset, ctx->ac.i32_0,
cache_policy); cache_policy);
} else { } else {
int num_channels = util_next_power_of_two(load_bytes) / 4; int num_channels = util_next_power_of_two(load_bytes) / 4;