KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radv: reduce CPU overhead in radv_flush_descriptors() 

The number of enabled descriptors for a given pipeline stage
can be computed at compile time.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Samuel Pitoiset 2018-07-03 12:43:40 +02:00
parent 81ca08e030
commit 5e5a28d52a
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/amd/vulkan/radv_cmd_buffer.c
View File

@ -593,16 +593,9 @@ radv_emit_descriptor_pointers(struct radv_cmd_buffer *cmd_buffer,
uint32_t sh_base = pipeline->user_data_0[stage]; uint32_t sh_base = pipeline->user_data_0[stage];
struct radv_userdata_locations *locs = struct radv_userdata_locations *locs =
&pipeline->shaders[stage]->info.user_sgprs_locs; &pipeline->shaders[stage]->info.user_sgprs_locs;
unsigned mask; unsigned mask = locs->descriptor_sets_enabled;
mask = descriptors_state->dirty & descriptors_state->valid; mask &= descriptors_state->dirty & descriptors_state->valid;
for (int i = 0; i < MAX_SETS; i++) {
struct radv_userdata_info *loc = &locs->descriptor_sets[i];
if (loc->sgpr_idx != -1 && !loc->indirect)
continue;
mask &= ~(1 << i);
}
while (mask) { while (mask) {
int start, count; int start, count;

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

@ -578,11 +578,14 @@ static void
set_loc_desc(struct radv_shader_context *ctx, int idx, uint8_t *sgpr_idx, set_loc_desc(struct radv_shader_context *ctx, int idx, uint8_t *sgpr_idx,
uint32_t indirect_offset) uint32_t indirect_offset)
{ {
struct radv_userdata_info *ud_info = struct radv_userdata_locations *locs =
&ctx->shader_info->user_sgprs_locs.descriptor_sets[idx]; &ctx->shader_info->user_sgprs_locs;
struct radv_userdata_info *ud_info = &locs->descriptor_sets[idx];
assert(ud_info); assert(ud_info);
set_loc(ud_info, sgpr_idx, HAVE_32BIT_POINTERS ? 1 : 2, indirect_offset); set_loc(ud_info, sgpr_idx, HAVE_32BIT_POINTERS ? 1 : 2, indirect_offset);
if (indirect_offset == 0)
locs->descriptor_sets_enabled |= 1 << idx;
} }
struct user_sgpr_info { struct user_sgpr_info {

1
src/amd/vulkan/radv_shader.h
View File

@ -197,6 +197,7 @@ struct radv_userdata_info {
struct radv_userdata_locations { struct radv_userdata_locations {
struct radv_userdata_info descriptor_sets[RADV_UD_MAX_SETS]; struct radv_userdata_info descriptor_sets[RADV_UD_MAX_SETS];
struct radv_userdata_info shader_data[AC_UD_MAX_UD]; struct radv_userdata_info shader_data[AC_UD_MAX_UD];
uint32_t descriptor_sets_enabled;
}; };
struct radv_vs_output_info { struct radv_vs_output_info {