From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Sun, 26 Feb 2023 14:33:45 +0000 (-0500)
Subject: zink: skip buffer barriers if the buffer can be easily proved idle
X-Git-Tag: upstream/23.3.3~12101
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c226ba24261ab68961e63ee645e1fa82e70d1f9;p=platform%2Fupstream%2Fmesa.git

zink: skip buffer barriers if the buffer can be easily proved idle

this should have no pending write hazards, which means this barrier
can just be used for tracking

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21583>
---

diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index 40bb91b..5f242a1 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -3875,14 +3875,15 @@ zink_resource_buffer_barrier(struct zink_context *ctx, struct zink_resource *res
    if (!zink_resource_buffer_needs_barrier(res, flags, pipeline))
       return;
 
-   if (res->obj->access) {
+   bool is_write = zink_resource_access_is_write(flags);
+   enum zink_resource_access rw = is_write ? ZINK_RESOURCE_ACCESS_RW : ZINK_RESOURCE_ACCESS_WRITE;
+   if (res->obj->access && !zink_resource_usage_check_completion_fast(zink_screen(ctx->base.screen), res, rw)) {
       VkMemoryBarrier bmb;
       bmb.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER;
       bmb.pNext = NULL;
       bmb.srcAccessMask = res->obj->access;
       bmb.dstAccessMask = flags;
       assert(res->obj->access_stage);
-      bool is_write = zink_resource_access_is_write(flags);
       VkCommandBuffer cmdbuf = is_write ? zink_get_cmdbuf(ctx, NULL, res) : zink_get_cmdbuf(ctx, res, NULL);
 
       bool marker = zink_cmd_debug_marker_begin(ctx, "buffer_barrier");
@@ -3912,7 +3913,9 @@ zink_resource_buffer_barrier2(struct zink_context *ctx, struct zink_resource *re
    if (!zink_resource_buffer_needs_barrier(res, flags, pipeline))
       return;
 
-   if (res->obj->access) {
+   bool is_write = zink_resource_access_is_write(flags);
+   enum zink_resource_access rw = is_write ? ZINK_RESOURCE_ACCESS_RW : ZINK_RESOURCE_ACCESS_WRITE;
+   if (res->obj->access && !zink_resource_usage_check_completion_fast(zink_screen(ctx->base.screen), res, rw)) {
       VkMemoryBarrier2 bmb;
       bmb.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER_2;
       bmb.pNext = NULL;
@@ -3921,7 +3924,6 @@ zink_resource_buffer_barrier2(struct zink_context *ctx, struct zink_resource *re
       bmb.dstStageMask = pipeline;
       bmb.dstAccessMask = flags;
       assert(res->obj->access_stage);
-      bool is_write = zink_resource_access_is_write(flags);
       VkCommandBuffer cmdbuf = is_write ? zink_get_cmdbuf(ctx, NULL, res) : zink_get_cmdbuf(ctx, res, NULL);
       VkDependencyInfo dep = {
          VK_STRUCTURE_TYPE_DEPENDENCY_INFO,