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

ac/llvm: implement nir_intrinsic_image_deref_atomic_{fmin,fmax}

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12716>
This commit is contained in:
Samuel Pitoiset
2021-09-03 10:25:37 +02:00
committed by Marge Bot
parent 9373db5d94
commit cf3e31fd11
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2076,6 +2076,10 @@ static const char *get_atomic_name(enum ac_atomic_op op)
return "inc"; return "inc";
case ac_atomic_dec_wrap: case ac_atomic_dec_wrap:
return "dec"; return "dec";
case ac_atomic_fmin:
return "fmin";
case ac_atomic_fmax:
return "fmax";
} }
unreachable("bad atomic op"); unreachable("bad atomic op");
} }

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

@@ -388,6 +388,8 @@ enum ac_atomic_op
ac_atomic_xor, ac_atomic_xor,
ac_atomic_inc_wrap, ac_atomic_inc_wrap,
ac_atomic_dec_wrap, ac_atomic_dec_wrap,
ac_atomic_fmin,
ac_atomic_fmax,
}; };
/* These cache policy bits match the definitions used by the LLVM intrinsics. */ /* These cache policy bits match the definitions used by the LLVM intrinsics. */

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

@@ -2726,6 +2726,14 @@ static LLVMValueRef visit_image_atomic(struct ac_nir_context *ctx, const nir_int
atomic_name = "dec"; atomic_name = "dec";
atomic_subop = ac_atomic_dec_wrap; atomic_subop = ac_atomic_dec_wrap;
break; break;
case nir_intrinsic_image_deref_atomic_fmin:
atomic_name = "fmin";
atomic_subop = ac_atomic_fmin;
break;
case nir_intrinsic_image_deref_atomic_fmax:
atomic_name = "fmax";
atomic_subop = ac_atomic_fmax;
break;
default: default:
abort(); abort();
} }
@@ -2734,6 +2742,9 @@ static LLVMValueRef visit_image_atomic(struct ac_nir_context *ctx, const nir_int
params[param_count++] = get_src(ctx, instr->src[4]); params[param_count++] = get_src(ctx, instr->src[4]);
params[param_count++] = get_src(ctx, instr->src[3]); params[param_count++] = get_src(ctx, instr->src[3]);
if (atomic_subop == ac_atomic_fmin || atomic_subop == ac_atomic_fmax)
params[0] = ac_to_float(&ctx->ac, params[0]);
LLVMValueRef result; LLVMValueRef result;
if (dim == GLSL_SAMPLER_DIM_BUF) { if (dim == GLSL_SAMPLER_DIM_BUF) {
params[param_count++] = get_image_descriptor(ctx, instr, dynamic_index, AC_DESC_BUFFER, true); params[param_count++] = get_image_descriptor(ctx, instr, dynamic_index, AC_DESC_BUFFER, true);
@@ -2743,12 +2754,16 @@ static LLVMValueRef visit_image_atomic(struct ac_nir_context *ctx, const nir_int
if (cmpswap && instr->dest.ssa.bit_size == 64) { if (cmpswap && instr->dest.ssa.bit_size == 64) {
result = emit_ssbo_comp_swap_64(ctx, params[2], params[3], params[1], params[0], true); result = emit_ssbo_comp_swap_64(ctx, params[2], params[3], params[1], params[0], true);
} else { } else {
LLVMTypeRef data_type = LLVMTypeOf(params[0]);
char type[8];
params[param_count++] = ctx->ac.i32_0; /* soffset */ params[param_count++] = ctx->ac.i32_0; /* soffset */
params[param_count++] = ctx->ac.i32_0; /* slc */ params[param_count++] = ctx->ac.i32_0; /* slc */
ac_build_type_name_for_intr(data_type, type, sizeof(type));
length = snprintf(intrinsic_name, sizeof(intrinsic_name), length = snprintf(intrinsic_name, sizeof(intrinsic_name),
"llvm.amdgcn.struct.buffer.atomic.%s.%s", atomic_name, "llvm.amdgcn.struct.buffer.atomic.%s.%s",
instr->dest.ssa.bit_size == 64 ? "i64" : "i32"); atomic_name, type);
assert(length < sizeof(intrinsic_name)); assert(length < sizeof(intrinsic_name));
result = ac_build_intrinsic(&ctx->ac, intrinsic_name, LLVMTypeOf(params[0]), params, param_count, 0); result = ac_build_intrinsic(&ctx->ac, intrinsic_name, LLVMTypeOf(params[0]), params, param_count, 0);
@@ -3721,6 +3736,8 @@ static void visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins
case nir_intrinsic_image_deref_atomic_comp_swap: case nir_intrinsic_image_deref_atomic_comp_swap:
case nir_intrinsic_image_deref_atomic_inc_wrap: case nir_intrinsic_image_deref_atomic_inc_wrap:
case nir_intrinsic_image_deref_atomic_dec_wrap: case nir_intrinsic_image_deref_atomic_dec_wrap:
case nir_intrinsic_image_deref_atomic_fmin:
case nir_intrinsic_image_deref_atomic_fmax:
result = visit_image_atomic(ctx, instr, false); result = visit_image_atomic(ctx, instr, false);
break; break;
case nir_intrinsic_bindless_image_size: case nir_intrinsic_bindless_image_size: