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

ac/llvm: remove inst_offset parameter from ac_build_buffer_store_dword

Browse Source 
There was a bug that inst_offset was added to soffset in one codepath and
to voffset in all other codepaths. The correct behavior is to add it
to voffset.

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 01:08:16 -04:00
committed by Marge Bot
parent 8abb612cba
commit f68aeaa2c2
7 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1153,22 +1153,24 @@ void ac_build_buffer_store_format(struct ac_llvm_context *ctx, LLVMValueRef rsrc
/* buffer_store_dword(,x2,x3,x4) <- the suffix is selected by the type of vdata. */ /* buffer_store_dword(,x2,x3,x4) <- the suffix is selected by the type of vdata. */
void ac_build_buffer_store_dword(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata, void ac_build_buffer_store_dword(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata,
LLVMValueRef vindex, LLVMValueRef voffset, LLVMValueRef soffset, LLVMValueRef vindex, LLVMValueRef voffset, LLVMValueRef soffset,
unsigned inst_offset, unsigned cache_policy) unsigned cache_policy)
{ {
unsigned num_channels = ac_get_llvm_num_components(vdata); unsigned num_channels = ac_get_llvm_num_components(vdata);
/* Split 3 channel stores if unsupported. */ /* Split 3 channel stores if unsupported. */
if (num_channels == 3 && !ac_has_vec3_support(ctx->chip_class, false)) { if (num_channels == 3 && !ac_has_vec3_support(ctx->chip_class, false)) {
LLVMValueRef v[3], v01; LLVMValueRef v[3], v01, voffset2;
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
v[i] = LLVMBuildExtractElement(ctx->builder, vdata, LLVMConstInt(ctx->i32, i, 0), ""); v[i] = LLVMBuildExtractElement(ctx->builder, vdata, LLVMConstInt(ctx->i32, i, 0), "");
} }
v01 = ac_build_gather_values(ctx, v, 2); v01 = ac_build_gather_values(ctx, v, 2);
ac_build_buffer_store_dword(ctx, rsrc, v01, vindex, voffset, soffset, inst_offset, cache_policy); voffset2 = LLVMBuildAdd(ctx->builder, voffset ? voffset : ctx->i32_0,
ac_build_buffer_store_dword(ctx, rsrc, v[2], vindex, voffset, soffset, inst_offset + 8, LLVMConstInt(ctx->i32, 8, 0), "");
cache_policy);
ac_build_buffer_store_dword(ctx, rsrc, v01, vindex, voffset, soffset, cache_policy);
ac_build_buffer_store_dword(ctx, rsrc, v[2], vindex, voffset2, soffset, cache_policy);
return; return;
} }
@@ -1177,12 +1179,7 @@ void ac_build_buffer_store_dword(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
* llvm.amdgcn.buffer.store doesn't have a separate soffset parameter. * llvm.amdgcn.buffer.store doesn't have a separate soffset parameter.
*/ */
if (!(cache_policy & ac_swizzled)) { if (!(cache_policy & ac_swizzled)) {
LLVMValueRef offset = soffset; ac_build_buffer_store_common(ctx, rsrc, ac_to_float(ctx, vdata), vindex, voffset, soffset,
if (inst_offset)
offset = LLVMBuildAdd(ctx->builder, offset, LLVMConstInt(ctx->i32, inst_offset, 0), "");
ac_build_buffer_store_common(ctx, rsrc, ac_to_float(ctx, vdata), vindex, voffset, offset,
cache_policy, false); cache_policy, false);
return; return;
} }
@@ -1192,8 +1189,6 @@ void ac_build_buffer_store_dword(struct ac_llvm_context *ctx, LLVMValueRef rsrc,
V_008F0C_BUF_DATA_FORMAT_32_32_32_32}; V_008F0C_BUF_DATA_FORMAT_32_32_32_32};
unsigned dfmt = dfmts[num_channels - 1]; unsigned dfmt = dfmts[num_channels - 1];
unsigned nfmt = V_008F0C_BUF_NUM_FORMAT_UINT; unsigned nfmt = V_008F0C_BUF_NUM_FORMAT_UINT;
LLVMValueRef immoffset = LLVMConstInt(ctx->i32, inst_offset, 0);
voffset = LLVMBuildAdd(ctx->builder, voffset ? voffset : ctx->i32_0, immoffset, "");
ac_build_tbuffer_store(ctx, rsrc, vdata, vindex, voffset, soffset, num_channels, dfmt, ac_build_tbuffer_store(ctx, rsrc, vdata, vindex, voffset, soffset, num_channels, dfmt,
nfmt, cache_policy); nfmt, cache_policy);

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

@@ -256,7 +256,7 @@ LLVMValueRef ac_build_load_to_sgpr_uint_wraparound(struct ac_llvm_context *ctx,
void ac_build_buffer_store_dword(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata, void ac_build_buffer_store_dword(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef vdata,
LLVMValueRef vindex, LLVMValueRef voffset, LLVMValueRef soffset, LLVMValueRef vindex, LLVMValueRef voffset, LLVMValueRef soffset,
unsigned inst_offset, unsigned cache_policy); unsigned cache_policy);
void ac_build_buffer_store_format(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef data, void ac_build_buffer_store_format(struct ac_llvm_context *ctx, LLVMValueRef rsrc, LLVMValueRef data,
LLVMValueRef vindex, LLVMValueRef voffset, unsigned cache_policy); LLVMValueRef vindex, LLVMValueRef voffset, unsigned cache_policy);

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

@@ -1887,7 +1887,7 @@ static void visit_store_ssbo(struct ac_nir_context *ctx, nir_intrinsic_instr *in
data = LLVMBuildBitCast(ctx->ac.builder, data, data_type, ""); data = LLVMBuildBitCast(ctx->ac.builder, data, data_type, "");
ac_build_buffer_store_dword(&ctx->ac, rsrc, data, NULL, offset, ac_build_buffer_store_dword(&ctx->ac, rsrc, data, NULL, offset,
ctx->ac.i32_0, 0, cache_policy); ctx->ac.i32_0, cache_policy);
} }
} }
@@ -4288,8 +4288,9 @@ static void visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins
if (slc) if (slc)
cache_policy |= ac_slc; cache_policy |= ac_slc;
ac_build_buffer_store_dword(&ctx->ac, descriptor, store_data, LLVMValueRef voffset = LLVMBuildAdd(ctx->ac.builder, addr_voffset,
NULL, addr_voffset, addr_soffset, const_offset, LLVMConstInt(ctx->ac.i32, const_offset, 0), "");
ac_build_buffer_store_dword(&ctx->ac, descriptor, store_data, NULL, voffset, addr_soffset,
cache_policy); cache_policy);
break; break;
} }

8
src/amd/vulkan/radv_nir_to_llvm.c
View File

@@ -280,7 +280,7 @@ visit_emit_vertex_with_counter(struct ac_shader_abi *abi, unsigned stream, LLVMV
out_val = LLVMBuildZExtOrBitCast(ctx->ac.builder, out_val, ctx->ac.i32, ""); out_val = LLVMBuildZExtOrBitCast(ctx->ac.builder, out_val, ctx->ac.i32, "");
ac_build_buffer_store_dword(&ctx->ac, ctx->gsvs_ring[stream], out_val, NULL, voffset, ac_build_buffer_store_dword(&ctx->ac, ctx->gsvs_ring[stream], out_val, NULL, voffset,
ac_get_arg(&ctx->ac, ctx->args->ac.gs2vs_offset), 0, ac_get_arg(&ctx->ac, ctx->args->ac.gs2vs_offset),
ac_glc | ac_slc | ac_swizzled); ac_glc | ac_slc | ac_swizzled);
} }
} }
@@ -834,8 +834,10 @@ radv_emit_stream_output(struct radv_shader_context *ctx, LLVMValueRef const *so_
break; break;
} }
ac_build_buffer_store_dword(&ctx->ac, so_buffers[buf], vdata, NULL, LLVMValueRef voffset = LLVMBuildAdd(ctx->ac.builder, so_write_offsets[buf],
so_write_offsets[buf], ctx->ac.i32_0, offset, ac_glc | ac_slc); LLVMConstInt(ctx->ac.i32, offset, 0), "");
ac_build_buffer_store_dword(&ctx->ac, so_buffers[buf], vdata, NULL, voffset, ctx->ac.i32_0,
ac_glc | ac_slc);
} }
static void static void

7
src/gallium/drivers/radeonsi/si_shader_llvm_gs.c
View File

@@ -177,9 +177,10 @@ void si_llvm_emit_es_epilogue(struct ac_shader_abi *abi)
continue; continue;
} }
ac_build_buffer_store_dword(&ctx->ac, ctx->esgs_ring, out_val, NULL, NULL, ac_build_buffer_store_dword(&ctx->ac, ctx->esgs_ring, out_val, NULL,
LLVMConstInt(ctx->ac.i32, (4 * param + chan) * 4, 0),
ac_get_arg(&ctx->ac, ctx->args.es2gs_offset), ac_get_arg(&ctx->ac, ctx->args.es2gs_offset),
(4 * param + chan) * 4, ac_glc | ac_slc | ac_swizzled); ac_glc | ac_slc | ac_swizzled);
} }
} }
@@ -279,7 +280,7 @@ static void si_llvm_emit_vertex(struct ac_shader_abi *abi, unsigned stream, LLVM
out_val = ac_to_integer(&ctx->ac, out_val); out_val = ac_to_integer(&ctx->ac, out_val);
ac_build_buffer_store_dword(&ctx->ac, ctx->gsvs_ring[stream], out_val, NULL, ac_build_buffer_store_dword(&ctx->ac, ctx->gsvs_ring[stream], out_val, NULL,
voffset, soffset, 0, ac_glc | ac_slc | ac_swizzled); voffset, soffset, ac_glc | ac_slc | ac_swizzled);
} }
} }

27
src/gallium/drivers/radeonsi/si_shader_llvm_tess.c
View File

@@ -537,8 +537,9 @@ static void si_nir_store_output_tcs(struct ac_shader_abi *abi,
values[chan] = value; values[chan] = value;
if (writemask != 0xF && !is_tess_factor) { if (writemask != 0xF && !is_tess_factor) {
ac_build_buffer_store_dword(&ctx->ac, buffer, value, NULL, addr, base, LLVMValueRef voffset = LLVMBuildAdd(ctx->ac.builder, addr,
4 * chan, ac_glc); LLVMConstInt(ctx->ac.i32, 4 * chan, 0), "");
ac_build_buffer_store_dword(&ctx->ac, buffer, value, NULL, voffset, base, ac_glc);
} }
/* Write tess factors into VGPRs for the epilog. */ /* Write tess factors into VGPRs for the epilog. */
@@ -555,7 +556,7 @@ static void si_nir_store_output_tcs(struct ac_shader_abi *abi,
if (writemask == 0xF && !is_tess_factor) { if (writemask == 0xF && !is_tess_factor) {
LLVMValueRef value = ac_build_gather_values(&ctx->ac, values, 4); LLVMValueRef value = ac_build_gather_values(&ctx->ac, values, 4);
ac_build_buffer_store_dword(&ctx->ac, buffer, value, NULL, addr, base, 0, ac_glc); ac_build_buffer_store_dword(&ctx->ac, buffer, value, NULL, addr, base, ac_glc);
} }
} }
@@ -662,7 +663,7 @@ static void si_copy_tcs_inputs(struct si_shader_context *ctx)
LLVMValueRef value = lshs_lds_load(ctx, ctx->ac.i32, ~0, lds_ptr); LLVMValueRef value = lshs_lds_load(ctx, ctx->ac.i32, ~0, lds_ptr);
ac_build_buffer_store_dword(&ctx->ac, buffer, value, NULL, buffer_addr, buffer_offset, 0, ac_build_buffer_store_dword(&ctx->ac, buffer, value, NULL, buffer_addr, buffer_offset,
ac_glc); ac_glc);
} }
} }
@@ -775,18 +776,22 @@ static void si_write_tess_factors(struct si_shader_context *ctx, LLVMValueRef re
ac_build_ifcc(&ctx->ac, ac_build_ifcc(&ctx->ac,
LLVMBuildICmp(ctx->ac.builder, LLVMIntEQ, rel_patch_id, ctx->ac.i32_0, ""), 6504); LLVMBuildICmp(ctx->ac.builder, LLVMIntEQ, rel_patch_id, ctx->ac.i32_0, ""), 6504);
ac_build_buffer_store_dword(&ctx->ac, buffer, LLVMConstInt(ctx->ac.i32, 0x80000000, 0), ac_build_buffer_store_dword(&ctx->ac, buffer, LLVMConstInt(ctx->ac.i32, 0x80000000, 0),
NULL, ctx->ac.i32_0, tf_base, offset, ac_glc); NULL, LLVMConstInt(ctx->ac.i32, offset, 0), tf_base, ac_glc);
ac_build_endif(&ctx->ac, 6504); ac_build_endif(&ctx->ac, 6504);
offset += 4; offset += 4;
} }
/* Store the tessellation factors. */ /* Store the tessellation factors. */
ac_build_buffer_store_dword(&ctx->ac, buffer, vec0, NULL, byteoffset, ac_build_buffer_store_dword(&ctx->ac, buffer, vec0, NULL,
tf_base, offset, ac_glc); LLVMBuildAdd(ctx->ac.builder, byteoffset,
LLVMConstInt(ctx->ac.i32, offset, 0), ""),
tf_base, ac_glc);
offset += 16; offset += 16;
if (vec1) if (vec1)
ac_build_buffer_store_dword(&ctx->ac, buffer, vec1, NULL, byteoffset, ac_build_buffer_store_dword(&ctx->ac, buffer, vec1, NULL,
tf_base, offset, ac_glc); LLVMBuildAdd(ctx->ac.builder, byteoffset,
LLVMConstInt(ctx->ac.i32, offset, 0), ""),
tf_base, ac_glc);
/* Store the tess factors into the offchip buffer if TES reads them. */ /* Store the tess factors into the offchip buffer if TES reads them. */
if (shader->key.ge.part.tcs.epilog.tes_reads_tess_factors) { if (shader->key.ge.part.tcs.epilog.tes_reads_tess_factors) {
@@ -804,7 +809,7 @@ static void si_write_tess_factors(struct si_shader_context *ctx, LLVMValueRef re
outer_vec = ac_build_gather_values(&ctx->ac, outer, outer_comps); outer_vec = ac_build_gather_values(&ctx->ac, outer, outer_comps);
ac_build_buffer_store_dword(&ctx->ac, buf, outer_vec, NULL, tf_outer_offset, ac_build_buffer_store_dword(&ctx->ac, buf, outer_vec, NULL, tf_outer_offset,
base, 0, ac_glc); base, ac_glc);
if (inner_comps) { if (inner_comps) {
param_inner = si_shader_io_get_unique_index_patch(VARYING_SLOT_TESS_LEVEL_INNER); param_inner = si_shader_io_get_unique_index_patch(VARYING_SLOT_TESS_LEVEL_INNER);
tf_inner_offset = get_tcs_tes_buffer_address(ctx, rel_patch_id, NULL, tf_inner_offset = get_tcs_tes_buffer_address(ctx, rel_patch_id, NULL,
@@ -812,7 +817,7 @@ static void si_write_tess_factors(struct si_shader_context *ctx, LLVMValueRef re
inner_vec = ac_build_gather_values(&ctx->ac, inner, inner_comps); inner_vec = ac_build_gather_values(&ctx->ac, inner, inner_comps);
ac_build_buffer_store_dword(&ctx->ac, buf, inner_vec, NULL, ac_build_buffer_store_dword(&ctx->ac, buf, inner_vec, NULL,
tf_inner_offset, base, 0, ac_glc); tf_inner_offset, base, ac_glc);
} }
} }

5
src/gallium/drivers/radeonsi/si_shader_llvm_vs.c
View File

@@ -304,8 +304,9 @@ void si_llvm_streamout_store_output(struct si_shader_context *ctx, LLVMValueRef
} }
ac_build_buffer_store_dword(&ctx->ac, so_buffers[buf_idx], vdata, NULL, ac_build_buffer_store_dword(&ctx->ac, so_buffers[buf_idx], vdata, NULL,
so_write_offsets[buf_idx], ctx->ac.i32_0, stream_out->dst_offset * 4, LLVMBuildAdd(ctx->ac.builder, so_write_offsets[buf_idx],
ac_glc | ac_slc); LLVMConstInt(ctx->ac.i32, stream_out->dst_offset * 4, 0), ""),
ctx->ac.i32_0, ac_glc | ac_slc);
} }
/** /**