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

asahi: Factor out agx_launch

Browse Source 
For launching compute kernels on particular batches without dirtying state.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26056>
This commit is contained in:
Alyssa Rosenzweig
2023-07-23 09:02:15 -04:00
committed by Marge Bot
parent 212f71734e
commit c9dd59fef3
2 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/gallium/drivers/asahi/agx_state.c
View File

@@ -3384,19 +3384,12 @@ agx_texture_barrier(struct pipe_context *pipe, unsigned flags)
agx_flush_all(ctx, "Texture barrier");
}
static void
agx_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
void
agx_launch(struct agx_batch *batch, const struct pipe_grid_info *info,
struct agx_compiled_shader *cs)
{
struct agx_context *ctx = agx_context(pipe);
struct agx_batch *batch = agx_get_compute_batch(ctx);
struct agx_device *dev = agx_device(pipe->screen);
agx_batch_init_state(batch);
/* Consider compute launches as "draws" for the purposes of sanity
* checking batch state.
*/
batch->any_draws = true;
struct agx_context *ctx = batch->ctx;
struct agx_device *dev = agx_device(ctx->base.screen);
/* To implement load_num_workgroups, the number of workgroups needs to be
* available in GPU memory. This is either the indirect buffer, or just a
@@ -3424,13 +3417,6 @@ agx_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
agx_batch_writes(batch, buffer);
}
struct agx_uncompiled_shader *uncompiled =
ctx->stage[PIPE_SHADER_COMPUTE].shader;
/* There is exactly one variant, get it */
struct agx_compiled_shader *cs =
_mesa_hash_table_next_entry(uncompiled->variants, NULL)->data;
agx_batch_add_bo(batch, cs->bo);
agx_update_descriptors(batch, cs, PIPE_SHADER_COMPUTE);
@@ -3493,6 +3479,30 @@ agx_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
batch->cdm.current = out;
assert(batch->cdm.current <= batch->cdm.end &&
"Failed to reserve sufficient space in encoder");
}
static void
agx_launch_grid(struct pipe_context *pipe, const struct pipe_grid_info *info)
{
struct agx_context *ctx = agx_context(pipe);
struct agx_batch *batch = agx_get_compute_batch(ctx);
agx_batch_init_state(batch);
/* Consider compute launches as "draws" for the purposes of sanity
* checking batch state.
*/
batch->any_draws = true;
struct agx_uncompiled_shader *uncompiled =
ctx->stage[PIPE_SHADER_COMPUTE].shader;
/* There is exactly one variant, get it */
struct agx_compiled_shader *cs =
_mesa_hash_table_next_entry(uncompiled->variants, NULL)->data;
agx_launch(batch, info, cs);
/* TODO: Dirty tracking? */
/* TODO: Allow multiple kernels in a batch? */

3
src/gallium/drivers/asahi/agx_state.h
View File

@@ -540,6 +540,9 @@ agx_context(struct pipe_context *pctx)
return (struct agx_context *)pctx;
}
void agx_launch(struct agx_batch *batch, const struct pipe_grid_info *info,
struct agx_compiled_shader *cs);
void agx_init_query_functions(struct pipe_context *ctx);
void