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

radv,ac/llvm: use a dword alignment for descriptor loads

Browse Source 
RADV doesn't try to keep anything 16 or 32 byte aligned. RADV also seems
to create better code for some reason.

fossil-db (Sienna Cichlid):
Totals from 37693 (30.93% of 121873) affected shaders:
SGPRs: 1762792 -> 1785504 (+1.29%); split: -1.01%, +2.30%
VGPRs: 1761032 -> 1760808 (-0.01%); split: -0.09%, +0.07%
SpillSGPRs: 55793 -> 56011 (+0.39%); split: -3.49%, +3.88%
SpillVGPRs: 16766 -> 16387 (-2.26%); split: -3.99%, +1.73%
CodeSize: 82902228 -> 82781608 (-0.15%); split: -0.29%, +0.14%
Scratch: 3024896 -> 2987008 (-1.25%); split: -3.08%, +1.83%
MaxWaves: 919794 -> 920302 (+0.06%); split: +0.09%, -0.03%

shader-db (Sienna Cichlid):
Totals from affected shaders:
SGPRS: 3976 -> 3976 (0.00 %)
VGPRS: 3392 -> 3392 (0.00 %)
Spilled SGPRs: 0 -> 0 (0.00 %)
Spilled VGPRs: 0 -> 0 (0.00 %)
Private memory VGPRs: 0 -> 0 (0.00 %)
Scratch size: 0 -> 0 (0.00 %) dwords per thread
Code Size: 178792 -> 178980 (0.11 %) bytes
Max Waves: 1389 -> 1389 (0.00 %)

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4715
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10543>
This commit is contained in:
Rhys Perry
2021-04-30 11:39:12 +01:00
committed by Marge Bot
parent 3d5c1c4989
commit d918a59d15
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1060,6 +1060,7 @@ static LLVMValueRef ac_build_load_custom(struct ac_llvm_context *ctx, LLVMValueR
result = LLVMBuildLoad(ctx->builder, pointer, ""); result = LLVMBuildLoad(ctx->builder, pointer, "");
if (invariant) if (invariant)
LLVMSetMetadata(result, ctx->invariant_load_md_kind, ctx->empty_md); LLVMSetMetadata(result, ctx->invariant_load_md_kind, ctx->empty_md);
LLVMSetAlignment(result, 4);
return result; return result;
} }
@@ -4692,7 +4693,7 @@ LLVMValueRef ac_build_main(const struct ac_shader_args *args, struct ac_llvm_con
if (LLVMGetTypeKind(LLVMTypeOf(P)) == LLVMPointerTypeKind) { if (LLVMGetTypeKind(LLVMTypeOf(P)) == LLVMPointerTypeKind) {
ac_add_function_attr(ctx->context, main_function, i + 1, AC_FUNC_ATTR_NOALIAS); ac_add_function_attr(ctx->context, main_function, i + 1, AC_FUNC_ATTR_NOALIAS);
ac_add_attr_dereferenceable(P, UINT64_MAX); ac_add_attr_dereferenceable(P, UINT64_MAX);
ac_add_attr_alignment(P, 32); ac_add_attr_alignment(P, 4);
} }
} }

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

@@ -122,6 +122,7 @@ load_descriptor_sets(struct radv_shader_context *ctx)
ctx->descriptor_sets[i] = ctx->descriptor_sets[i] =
ac_build_load_to_sgpr(&ctx->ac, desc_sets, LLVMConstInt(ctx->ac.i32, i, false)); ac_build_load_to_sgpr(&ctx->ac, desc_sets, LLVMConstInt(ctx->ac.i32, i, false));
LLVMSetAlignment(ctx->descriptor_sets[i], 4);
} }
} else { } else {
while (mask) { while (mask) {
@@ -445,6 +446,7 @@ radv_load_ssbo(struct ac_shader_abi *abi, LLVMValueRef buffer_ptr, bool write, b
result = LLVMBuildLoad(ctx->ac.builder, buffer_ptr, ""); result = LLVMBuildLoad(ctx->ac.builder, buffer_ptr, "");
LLVMSetMetadata(result, ctx->ac.invariant_load_md_kind, ctx->ac.empty_md); LLVMSetMetadata(result, ctx->ac.invariant_load_md_kind, ctx->ac.empty_md);
LLVMSetAlignment(result, 4);
return result; return result;
} }
@@ -494,6 +496,7 @@ radv_load_ubo(struct ac_shader_abi *abi, unsigned desc_set, unsigned binding, bo
result = LLVMBuildLoad(ctx->ac.builder, buffer_ptr, ""); result = LLVMBuildLoad(ctx->ac.builder, buffer_ptr, "");
LLVMSetMetadata(result, ctx->ac.invariant_load_md_kind, ctx->ac.empty_md); LLVMSetMetadata(result, ctx->ac.invariant_load_md_kind, ctx->ac.empty_md);
LLVMSetAlignment(result, 4);
return result; return result;
} }