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

freedreno: Skip some batch dependency tracking if !ctx->dirty.

Browse Source 
drawoverhead test 1 perf 4.37618% +/- 0.933261% (n=57)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8602>
This commit is contained in:
Eric Anholt
2021-01-20 14:20:46 -08:00
committed by Marge Bot
parent 49b83509fe
commit aa1ddb6fe3
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/gallium/drivers/freedreno/freedreno_draw.c
View File

@@ -59,24 +59,12 @@ resource_written(struct fd_batch *batch, struct pipe_resource *prsc)
} }
static void static void
batch_draw_tracking(struct fd_batch *batch, const struct pipe_draw_info *info, batch_draw_tracking_for_dirty_bits(struct fd_batch *batch)
const struct pipe_draw_indirect_info *indirect)
{ {
struct fd_context *ctx = batch->ctx; struct fd_context *ctx = batch->ctx;
struct pipe_framebuffer_state *pfb = &batch->framebuffer; struct pipe_framebuffer_state *pfb = &batch->framebuffer;
unsigned buffers = 0, restore_buffers = 0; unsigned buffers = 0, restore_buffers = 0;
/* NOTE: needs to be before resource_written(batch->query_buf), otherwise
* query_buf may not be created yet.
*/
fd_batch_set_stage(batch, FD_STAGE_DRAW);
/*
* Figure out the buffers/features we need:
*/
fd_screen_lock(ctx->screen);
if (ctx->dirty & (FD_DIRTY_FRAMEBUFFER | FD_DIRTY_ZSA)) { if (ctx->dirty & (FD_DIRTY_FRAMEBUFFER | FD_DIRTY_ZSA)) {
if (fd_depth_enabled(ctx)) { if (fd_depth_enabled(ctx)) {
if (fd_resource(pfb->zsbuf->texture)->valid) { if (fd_resource(pfb->zsbuf->texture)->valid) {
@@ -176,14 +164,6 @@ batch_draw_tracking(struct fd_batch *batch, const struct pipe_draw_info *info,
} }
} }
/* Mark index buffer as being read */
if (info->index_size)
resource_read(batch, info->index.resource);
/* Mark indirect draw buffer as being read */
if (indirect && indirect->buffer)
resource_read(batch, indirect->buffer);
/* Mark textures as being read */ /* Mark textures as being read */
if (ctx->dirty_shader[PIPE_SHADER_VERTEX] & FD_DIRTY_SHADER_TEX) { if (ctx->dirty_shader[PIPE_SHADER_VERTEX] & FD_DIRTY_SHADER_TEX) {
foreach_bit (i, ctx->tex[PIPE_SHADER_VERTEX].valid_textures) foreach_bit (i, ctx->tex[PIPE_SHADER_VERTEX].valid_textures)
@@ -202,17 +182,46 @@ batch_draw_tracking(struct fd_batch *batch, const struct pipe_draw_info *info,
resource_written(batch, ctx->streamout.targets[i]->buffer); resource_written(batch, ctx->streamout.targets[i]->buffer);
} }
/* any buffers that haven't been cleared yet, we need to restore: */
batch->restore |= restore_buffers & (FD_BUFFER_ALL & ~batch->invalidated);
/* and any buffers used, need to be resolved: */
batch->resolve |= buffers;
}
static void
batch_draw_tracking(struct fd_batch *batch, const struct pipe_draw_info *info,
const struct pipe_draw_indirect_info *indirect)
{
struct fd_context *ctx = batch->ctx;
/* NOTE: needs to be before resource_written(batch->query_buf), otherwise
* query_buf may not be created yet.
*/
fd_batch_set_stage(batch, FD_STAGE_DRAW);
/*
* Figure out the buffers/features we need:
*/
fd_screen_lock(ctx->screen);
if (ctx->dirty)
batch_draw_tracking_for_dirty_bits(batch);
/* Mark index buffer as being read */
if (info->index_size)
resource_read(batch, info->index.resource);
/* Mark indirect draw buffer as being read */
if (indirect && indirect->buffer)
resource_read(batch, indirect->buffer);
resource_written(batch, batch->query_buf); resource_written(batch, batch->query_buf);
list_for_each_entry(struct fd_acc_query, aq, &ctx->acc_active_queries, node) list_for_each_entry(struct fd_acc_query, aq, &ctx->acc_active_queries, node)
resource_written(batch, aq->prsc); resource_written(batch, aq->prsc);
fd_screen_unlock(ctx->screen); fd_screen_unlock(ctx->screen);
/* any buffers that haven't been cleared yet, we need to restore: */
batch->restore |= restore_buffers & (FD_BUFFER_ALL & ~batch->invalidated);
/* and any buffers used, need to be resolved: */
batch->resolve |= buffers;
} }
static void static void