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

anv: limit ANV_PIPE_RENDER_TARGET_BUFFER_WRITES to blorp operations using 3D

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Rohan Garg <rohan.garg@intel.com>
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23074>
This commit is contained in:
Lionel Landwerlin
2023-05-17 13:40:14 +03:00
parent d7c28e526b
commit 455a13fb7f
4 changed files with 48 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/intel/vulkan/anv_blorp.c
View File

@@ -542,6 +542,8 @@ anv_add_buffer_write_pending_bits(struct anv_cmd_buffer *cmd_buffer,
const struct intel_device_info *devinfo = cmd_buffer->device->info; const struct intel_device_info *devinfo = cmd_buffer->device->info;
cmd_buffer->state.pending_query_bits |= cmd_buffer->state.pending_query_bits |=
(cmd_buffer->queue_family->queueFlags & VK_QUEUE_GRAPHICS_BIT) == 0 ?
ANV_QUERY_COMPUTE_WRITES_PENDING_BITS :
ANV_QUERY_RENDER_TARGET_WRITES_PENDING_BITS(devinfo); ANV_QUERY_RENDER_TARGET_WRITES_PENDING_BITS(devinfo);
} }
@@ -562,9 +564,9 @@ void anv_CmdCopyImageToBuffer2(
&pCopyImageToBufferInfo->pRegions[r], false); &pCopyImageToBufferInfo->pRegions[r], false);
} }
anv_blorp_batch_finish(&batch);
anv_add_buffer_write_pending_bits(cmd_buffer, "after copy image to buffer"); anv_add_buffer_write_pending_bits(cmd_buffer, "after copy image to buffer");
anv_blorp_batch_finish(&batch);
} }
static bool static bool
@@ -787,9 +789,9 @@ void anv_CmdCopyBuffer2(
&pCopyBufferInfo->pRegions[r]); &pCopyBufferInfo->pRegions[r]);
} }
anv_blorp_batch_finish(&batch);
anv_add_buffer_write_pending_bits(cmd_buffer, "after copy buffer"); anv_add_buffer_write_pending_bits(cmd_buffer, "after copy buffer");
anv_blorp_batch_finish(&batch);
} }
@@ -849,9 +851,9 @@ void anv_CmdUpdateBuffer(
pData = (void *)pData + copy_size; pData = (void *)pData + copy_size;
} }
anv_blorp_batch_finish(&batch);
anv_add_buffer_write_pending_bits(cmd_buffer, "update buffer"); anv_add_buffer_write_pending_bits(cmd_buffer, "update buffer");
anv_blorp_batch_finish(&batch);
} }
void void
@@ -960,7 +962,6 @@ void anv_CmdFillBuffer(
fillSize, data); fillSize, data);
anv_add_buffer_write_pending_bits(cmd_buffer, "after fill buffer"); anv_add_buffer_write_pending_bits(cmd_buffer, "after fill buffer");
} }
void anv_CmdClearColorImage( void anv_CmdClearColorImage(

29
src/intel/vulkan/anv_private.h
View File

@@ -2205,11 +2205,13 @@ enum anv_pipe_bits {
* based on PIPE_CONTROL emissions. * based on PIPE_CONTROL emissions.
*/ */
enum anv_query_bits { enum anv_query_bits {
ANV_QUERY_RENDER_TARGET_WRITES_RT_FLUSH = (1 << 0), ANV_QUERY_WRITES_RT_FLUSH = (1 << 0),
ANV_QUERY_RENDER_TARGET_WRITES_TILE_FLUSH = (1 << 1), ANV_QUERY_WRITES_TILE_FLUSH = (1 << 1),
ANV_QUERY_RENDER_TARGET_WRITES_CS_STALL = (1 << 2), ANV_QUERY_WRITES_CS_STALL = (1 << 2),
ANV_QUERY_WRITES_DATA_FLUSH = (1 << 3),
}; };
/* Things we need to flush before accessing query data using the command /* Things we need to flush before accessing query data using the command
@@ -2224,17 +2226,24 @@ enum anv_query_bits {
*/ */
#define ANV_QUERY_RENDER_TARGET_WRITES_PENDING_BITS(devinfo) \ #define ANV_QUERY_RENDER_TARGET_WRITES_PENDING_BITS(devinfo) \
(((devinfo->verx10 >= 120 && \ (((devinfo->verx10 >= 120 && \
devinfo->verx10 < 125) ? ANV_QUERY_RENDER_TARGET_WRITES_TILE_FLUSH : 0) | \ devinfo->verx10 < 125) ? ANV_QUERY_WRITES_TILE_FLUSH : 0) | \
ANV_QUERY_RENDER_TARGET_WRITES_RT_FLUSH | \ ANV_QUERY_WRITES_RT_FLUSH | \
ANV_QUERY_RENDER_TARGET_WRITES_CS_STALL) ANV_QUERY_WRITES_CS_STALL)
#define ANV_QUERY_COMPUTE_WRITES_PENDING_BITS \
(ANV_QUERY_WRITES_DATA_FLUSH | \
ANV_QUERY_WRITES_CS_STALL)
#define ANV_PIPE_QUERY_BITS(pending_query_bits) ( \ #define ANV_PIPE_QUERY_BITS(pending_query_bits) ( \
((pending_query_bits & ANV_QUERY_RENDER_TARGET_WRITES_RT_FLUSH) ? \ ((pending_query_bits & ANV_QUERY_WRITES_RT_FLUSH) ? \
ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT : 0) | \ ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT : 0) | \
((pending_query_bits & ANV_QUERY_RENDER_TARGET_WRITES_TILE_FLUSH) ? \ ((pending_query_bits & ANV_QUERY_WRITES_TILE_FLUSH) ? \
ANV_PIPE_TILE_CACHE_FLUSH_BIT : 0) | \ ANV_PIPE_TILE_CACHE_FLUSH_BIT : 0) | \
((pending_query_bits & ANV_QUERY_RENDER_TARGET_WRITES_CS_STALL) ? \ ((pending_query_bits & ANV_QUERY_WRITES_CS_STALL) ? \
ANV_PIPE_CS_STALL_BIT : 0)) ANV_PIPE_CS_STALL_BIT : 0) | \
((pending_query_bits & ANV_QUERY_WRITES_DATA_FLUSH) ? \
(ANV_PIPE_DATA_CACHE_FLUSH_BIT | \
ANV_PIPE_HDC_PIPELINE_FLUSH_BIT | \
ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT) : 0))
#define ANV_PIPE_FLUSH_BITS ( \ #define ANV_PIPE_FLUSH_BITS ( \
ANV_PIPE_DEPTH_CACHE_FLUSH_BIT | \ ANV_PIPE_DEPTH_CACHE_FLUSH_BIT | \

16
src/intel/vulkan/genX_cmd_buffer.c
View File

@@ -1631,16 +1631,22 @@ genX(emit_apply_pipe_flushes)(struct anv_batch *batch,
*/ */
if (query_bits != NULL) { if (query_bits != NULL) {
if (bits & ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT)
*query_bits &= ~ANV_QUERY_RENDER_TARGET_WRITES_RT_FLUSH; *query_bits &= ~ANV_QUERY_WRITES_RT_FLUSH;
if (bits & ANV_PIPE_TILE_CACHE_FLUSH_BIT) if (bits & ANV_PIPE_TILE_CACHE_FLUSH_BIT)
*query_bits &= ~ANV_QUERY_RENDER_TARGET_WRITES_TILE_FLUSH; *query_bits &= ~ANV_QUERY_WRITES_TILE_FLUSH;
if ((bits & ANV_PIPE_DATA_CACHE_FLUSH_BIT) &&
(bits & ANV_PIPE_HDC_PIPELINE_FLUSH_BIT) &&
(bits & ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT))
*query_bits &= ~ANV_QUERY_WRITES_TILE_FLUSH;
/* Once RT/TILE have been flushed, we can consider the CS_STALL flush */ /* Once RT/TILE have been flushed, we can consider the CS_STALL flush */
if ((*query_bits & (ANV_QUERY_RENDER_TARGET_WRITES_TILE_FLUSH | if ((*query_bits & (ANV_QUERY_WRITES_TILE_FLUSH |
ANV_QUERY_RENDER_TARGET_WRITES_RT_FLUSH)) == 0 && ANV_QUERY_WRITES_RT_FLUSH |
ANV_QUERY_WRITES_DATA_FLUSH)) == 0 &&
(bits & (ANV_PIPE_END_OF_PIPE_SYNC_BIT | ANV_PIPE_CS_STALL_BIT))) (bits & (ANV_PIPE_END_OF_PIPE_SYNC_BIT | ANV_PIPE_CS_STALL_BIT)))
*query_bits &= ~ANV_QUERY_RENDER_TARGET_WRITES_CS_STALL; *query_bits &= ~ANV_QUERY_WRITES_CS_STALL;
} }
bits &= ~(ANV_PIPE_FLUSH_BITS | ANV_PIPE_STALL_BITS | bits &= ~(ANV_PIPE_FLUSH_BITS | ANV_PIPE_STALL_BITS |

13
src/intel/vulkan/genX_query.c
View File

@@ -1522,15 +1522,22 @@ void genX(CmdCopyQueryPoolResults)(
* command streamer. * command streamer.
*/ */
if (cmd_buffer->state.pending_query_bits & if (cmd_buffer->state.pending_query_bits &
ANV_QUERY_RENDER_TARGET_WRITES_RT_FLUSH) ANV_QUERY_WRITES_RT_FLUSH)
needed_flushes |= ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT; needed_flushes |= ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT;
if (cmd_buffer->state.pending_query_bits & if (cmd_buffer->state.pending_query_bits &
ANV_QUERY_RENDER_TARGET_WRITES_TILE_FLUSH) ANV_QUERY_WRITES_TILE_FLUSH)
needed_flushes |= ANV_PIPE_TILE_CACHE_FLUSH_BIT; needed_flushes |= ANV_PIPE_TILE_CACHE_FLUSH_BIT;
if (cmd_buffer->state.pending_query_bits & if (cmd_buffer->state.pending_query_bits &
ANV_QUERY_RENDER_TARGET_WRITES_CS_STALL) ANV_QUERY_WRITES_DATA_FLUSH) {
needed_flushes |= (ANV_PIPE_DATA_CACHE_FLUSH_BIT |
ANV_PIPE_HDC_PIPELINE_FLUSH_BIT |
ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT);
}
if (cmd_buffer->state.pending_query_bits &
ANV_QUERY_WRITES_CS_STALL)
needed_flushes |= ANV_PIPE_CS_STALL_BIT; needed_flushes |= ANV_PIPE_CS_STALL_BIT;
/* Occlusion & timestamp queries are written using a PIPE_CONTROL and /* Occlusion & timestamp queries are written using a PIPE_CONTROL and