fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 05:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi: export si_setup_compute_scratch_buffer for task shader

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38044>
This commit is contained in:
Qiang Yu 2025-05-30 21:12:07 +08:00 • committed by Marge Bot
parent 915d5167af
commit 12f33b596c
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/gallium/drivers/radeonsi/si_compute.c
View file

@ -295,34 +295,35 @@ static void si_set_global_binding(struct pipe_context *ctx, unsigned first, unsi
} }
} }
static bool si_setup_compute_scratch_buffer(struct si_context *sctx, struct si_shader *shader) bool si_setup_compute_scratch_buffer(struct si_screen *screen,
struct si_shader *shader,
struct si_resource **scratch_buffer,
unsigned max_scratch_bytes_per_wave)
{ {
uint64_t scratch_bo_size = uint64_t scratch_bo_size = *scratch_buffer ? (*scratch_buffer)->b.b.width0 : 0;
sctx->compute_scratch_buffer ? sctx->compute_scratch_buffer->b.b.width0 : 0; uint64_t scratch_needed = (uint64_t)max_scratch_bytes_per_wave * screen->info.max_scratch_waves;
uint64_t scratch_needed = (uint64_t)sctx->max_seen_compute_scratch_bytes_per_wave *
sctx->screen->info.max_scratch_waves;
assert(scratch_needed); assert(scratch_needed);
if (scratch_bo_size < scratch_needed) { if (scratch_bo_size < scratch_needed) {
si_resource_reference(&sctx->compute_scratch_buffer, NULL); si_resource_reference(scratch_buffer, NULL);
sctx->compute_scratch_buffer = *scratch_buffer =
si_aligned_buffer_create(&sctx->screen->b, si_aligned_buffer_create(&screen->b,
PIPE_RESOURCE_FLAG_UNMAPPABLE | SI_RESOURCE_FLAG_DRIVER_INTERNAL | PIPE_RESOURCE_FLAG_UNMAPPABLE | SI_RESOURCE_FLAG_DRIVER_INTERNAL |
SI_RESOURCE_FLAG_DISCARDABLE, SI_RESOURCE_FLAG_DISCARDABLE,
PIPE_USAGE_DEFAULT, PIPE_USAGE_DEFAULT,
scratch_needed, sctx->screen->info.pte_fragment_size); scratch_needed, screen->info.pte_fragment_size);
if (!sctx->compute_scratch_buffer) if (!*scratch_buffer)
return false; return false;
} }
/* Set the scratch address in the shader binary. */ /* Set the scratch address in the shader binary. */
if (!sctx->screen->info.has_scratch_base_registers) { if (!screen->info.has_scratch_base_registers) {
uint64_t scratch_va = sctx->compute_scratch_buffer->gpu_address; uint64_t scratch_va = (*scratch_buffer)->gpu_address;
if (shader->scratch_va != scratch_va) { if (shader->scratch_va != scratch_va) {
if (!si_shader_binary_upload(sctx->screen, shader, scratch_va)) if (!si_shader_binary_upload(screen, shader, scratch_va))
return false; return false;
shader->scratch_va = scratch_va; shader->scratch_va = scratch_va;
@ -382,7 +383,9 @@ static bool si_switch_compute_shader(struct si_context *sctx, struct si_compute
si_get_scratch_tmpring_size(sctx, config->scratch_bytes_per_wave, true, si_get_scratch_tmpring_size(sctx, config->scratch_bytes_per_wave, true,
&sctx->compute_tmpring_size); &sctx->compute_tmpring_size);
if (!si_setup_compute_scratch_buffer(sctx, shader)) if (!si_setup_compute_scratch_buffer(sctx->screen, shader,
&sctx->compute_scratch_buffer,
sctx->max_seen_compute_scratch_bytes_per_wave))
return false; return false;
radeon_add_to_buffer_list(sctx, &sctx->gfx_cs, sctx->compute_scratch_buffer, radeon_add_to_buffer_list(sctx, &sctx->gfx_cs, sctx->compute_scratch_buffer,

4
src/gallium/drivers/radeonsi/si_pipe.h
View file

@ -1484,6 +1484,10 @@ void si_gfx_clear_render_target(struct pipe_context *ctx, struct pipe_surface *d
void si_init_clear_functions(struct si_context *sctx); void si_init_clear_functions(struct si_context *sctx);
/* si_compute.c */ /* si_compute.c */
bool si_setup_compute_scratch_buffer(struct si_screen *screen,
struct si_shader *shader,
struct si_resource **scratch_buffer,
unsigned max_scratch_bytes_per_wave);
void si_destroy_compute(struct si_compute *program); void si_destroy_compute(struct si_compute *program);
/* si_compute_blit.c */ /* si_compute_blit.c */