fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-11 01:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: upload prologs/epilogs as part of radv_shader_part_create()

Browse source 
Don't need to duplicate this code.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21897>
This commit is contained in:
Samuel Pitoiset 2023-03-10 15:54:28 +01:00 • committed by Marge Bot
parent aa15d64949
commit eba315d2bf
2 changed files with 45 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
src/amd/vulkan/radv_shader.c
View file

@ -2487,29 +2487,7 @@ radv_shader_create(struct radv_device *device, const struct radv_shader_binary *
return shader;
}
static struct radv_shader_part *
radv_shader_part_create(struct radv_shader_part_binary *binary, unsigned wave_size)
{
uint32_t code_size = radv_get_shader_binary_size(binary->code_size);
struct radv_shader_part *shader_part;
shader_part = calloc(1, sizeof(struct radv_shader_part));
if (!shader_part)
return NULL;
shader_part->ref_count = 1;
shader_part->code_size = code_size;
shader_part->rsrc1 = S_00B848_VGPRS((binary->num_vgprs - 1) / (wave_size == 32 ? 8 : 4)) |
S_00B228_SGPRS((binary->num_sgprs - 1) / 8);
shader_part->disasm_string =
binary->disasm_size ? strdup((const char *)(binary->data + binary->code_size)) : NULL;
shader_part->spi_shader_col_format = binary->info.spi_shader_col_format;
return shader_part;
}
bool
static bool
radv_shader_part_binary_upload(struct radv_device *device, const struct radv_shader_part_binary *bin,
struct radv_shader_part *shader_part)
{
@ -2543,6 +2521,44 @@ radv_shader_part_binary_upload(struct radv_device *device, const struct radv_sha
return true;
}
static struct radv_shader_part *
radv_shader_part_create(struct radv_device *device, struct radv_shader_part_binary *binary,
unsigned wave_size)
{
uint32_t code_size = radv_get_shader_binary_size(binary->code_size);
struct radv_shader_part *shader_part;
shader_part = calloc(1, sizeof(struct radv_shader_part));
if (!shader_part)
return NULL;
shader_part->ref_count = 1;
shader_part->code_size = code_size;
shader_part->rsrc1 = S_00B848_VGPRS((binary->num_vgprs - 1) / (wave_size == 32 ? 8 : 4)) |
S_00B228_SGPRS((binary->num_sgprs - 1) / 8);
shader_part->disasm_string =
binary->disasm_size ? strdup((const char *)(binary->data + binary->code_size)) : NULL;
shader_part->spi_shader_col_format = binary->info.spi_shader_col_format;
/* Allocate memory and upload. */
shader_part->alloc = radv_alloc_shader_memory(device, shader_part->code_size, NULL);
if (!shader_part->alloc)
goto fail;
shader_part->bo = shader_part->alloc->arena->bo;
shader_part->va = radv_buffer_get_va(shader_part->bo) + shader_part->alloc->offset;
if (!radv_shader_part_binary_upload(device, binary, shader_part))
goto fail;
return shader_part;
fail:
radv_shader_part_destroy(device, shader_part);
return NULL;
}
static char *
radv_dump_nir_shaders(struct nir_shader *const *shaders, int shader_count)
{
@ -2907,23 +2923,12 @@ radv_create_vs_prolog(struct radv_device *device, const struct radv_vs_prolog_ke
aco_compile_vs_prolog(&ac_opts, &ac_info, &ac_prolog_info, &args.ac, &radv_aco_build_shader_part,
(void **)&binary);
prolog = radv_shader_part_create(binary, info.wave_size);
prolog = radv_shader_part_create(device, binary, info.wave_size);
if (!prolog)
goto fail_create;
goto fail;
prolog->nontrivial_divisors = key->state->nontrivial_divisors;
/* Allocate memory and upload the prolog. */
prolog->alloc = radv_alloc_shader_memory(device, prolog->code_size, NULL);
if (!prolog->alloc)
goto fail_alloc;
prolog->bo = prolog->alloc->arena->bo;
prolog->va = radv_buffer_get_va(prolog->bo) + prolog->alloc->offset;
if (!radv_shader_part_binary_upload(device, binary, prolog))
goto fail_alloc;
if (options.dump_shader) {
fprintf(stderr, "Vertex prolog");
fprintf(stderr, "\ndisasm:\n%s\n", prolog->disasm_string);
@ -2933,9 +2938,7 @@ radv_create_vs_prolog(struct radv_device *device, const struct radv_vs_prolog_ke
return prolog;
fail_alloc:
radv_shader_part_destroy(device, prolog);
fail_create:
fail:
free(binary);
return NULL;
}
@ -2973,20 +2976,9 @@ radv_create_ps_epilog(struct radv_device *device, const struct radv_ps_epilog_ke
binary->info.spi_shader_col_format = key->spi_shader_col_format;
epilog = radv_shader_part_create(binary, info.wave_size);
epilog = radv_shader_part_create(device, binary, info.wave_size);
if (!epilog)
goto fail_create;
/* Allocate memory and upload the epilog. */
epilog->alloc = radv_alloc_shader_memory(device, epilog->code_size, NULL);
if (!epilog->alloc)
goto fail_alloc;
epilog->bo = epilog->alloc->arena->bo;
epilog->va = radv_buffer_get_va(epilog->bo) + epilog->alloc->offset;
if (!radv_shader_part_binary_upload(device, binary, epilog))
goto fail_alloc;
goto fail;
if (options.dump_shader) {
fprintf(stderr, "Fragment epilog");
@ -2997,9 +2989,7 @@ radv_create_ps_epilog(struct radv_device *device, const struct radv_ps_epilog_ke
return epilog;
fail_alloc:
radv_shader_part_destroy(device, epilog);
fail_create:
fail:
free(binary);
return NULL;
}

4
src/amd/vulkan/radv_shader.h
View file

@ -589,10 +589,6 @@ struct radv_shader *radv_shader_nir_to_asm(
VkResult radv_shader_wait_for_upload(struct radv_device *device, uint64_t seq);
bool radv_shader_part_binary_upload(struct radv_device *device,
const struct radv_shader_part_binary *bin,
struct radv_shader_part *shader_part);
struct radv_shader_dma_submission *
radv_shader_dma_pop_submission(struct radv_device *device);