fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 11:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: update pipeline barriers for Xe2+

Browse source 
We experimentally found that some fixed functions have apparently be
hooked up to the L3. So we can drop a some flushing.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38707>
This commit is contained in:
Lionel Landwerlin 2024-10-16 13:55:55 +03:00 • committed by Marge Bot
parent 15524de710
commit 503355c7f8
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/intel/vulkan/anv_private.h
View file

@ -4093,6 +4093,12 @@ enum anv_query_bits {
ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT | \ ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT | \
ANV_PIPE_TILE_CACHE_FLUSH_BIT) ANV_PIPE_TILE_CACHE_FLUSH_BIT)
#define ANV_PIPE_L1_L2_BARRIER_FLUSH_BITS ( \
ANV_PIPE_DEPTH_CACHE_FLUSH_BIT | \
ANV_PIPE_HDC_PIPELINE_FLUSH_BIT | \
ANV_PIPE_UNTYPED_DATAPORT_CACHE_FLUSH_BIT | \
ANV_PIPE_RENDER_TARGET_CACHE_FLUSH_BIT)
#define ANV_PIPE_STALL_BITS ( \ #define ANV_PIPE_STALL_BITS ( \
ANV_PIPE_STALL_AT_SCOREBOARD_BIT | \ ANV_PIPE_STALL_AT_SCOREBOARD_BIT | \
ANV_PIPE_DEPTH_STALL_BIT | \ ANV_PIPE_DEPTH_STALL_BIT | \

24
src/intel/vulkan/genX_cmd_buffer.c
View file

@ -3897,6 +3897,7 @@ anv_pipe_flush_bits_for_access_flags(struct anv_cmd_buffer *cmd_buffer,
VkAccessFlags2 flags, VkAccessFlags2 flags,
VkAccessFlagBits3KHR flags3) VkAccessFlagBits3KHR flags3)
{ {
struct anv_device *device = cmd_buffer->device;
enum anv_pipe_bits pipe_bits = 0; enum anv_pipe_bits pipe_bits = 0;
u_foreach_bit64(b, flags) { u_foreach_bit64(b, flags) {
@ -3955,9 +3956,13 @@ anv_pipe_flush_bits_for_access_flags(struct anv_cmd_buffer *cmd_buffer,
break; break;
case VK_ACCESS_2_MEMORY_WRITE_BIT: case VK_ACCESS_2_MEMORY_WRITE_BIT:
/* We're transitioning a buffer for generic write operations. Flush /* We're transitioning a buffer for generic write operations. Flush
* all the caches. * all the caches. On Gfx20+ we can limit ourself to L1/L2 flushing
* because all the fixed functions are L3 coherent (CS, streamout).
*/ */
if (device->info->ver < 20)
pipe_bits |= ANV_PIPE_BARRIER_FLUSH_BITS; pipe_bits |= ANV_PIPE_BARRIER_FLUSH_BITS;
else
pipe_bits |= ANV_PIPE_L1_L2_BARRIER_FLUSH_BITS;
break; break;
case VK_ACCESS_2_HOST_WRITE_BIT: case VK_ACCESS_2_HOST_WRITE_BIT:
/* We're transitioning a buffer for access by CPU. Invalidate /* We're transitioning a buffer for access by CPU. Invalidate
@ -4015,11 +4020,13 @@ anv_pipe_invalidate_bits_for_access_flags(struct anv_cmd_buffer *cmd_buffer,
* an A64 message, so we need to invalidate constant cache. * an A64 message, so we need to invalidate constant cache.
*/ */
pipe_bits |= ANV_PIPE_CONSTANT_CACHE_INVALIDATE_BIT; pipe_bits |= ANV_PIPE_CONSTANT_CACHE_INVALIDATE_BIT;
/* Tile & Data cache flush needed For Cmd*Indirect* commands since /* Prior to Gfx20, Tile & Data cache flush needed For Cmd*Indirect*
* command streamer is not L3 coherent. * commands since command streamer is not L3 coherent.
*/ */
pipe_bits |= ANV_PIPE_TILE_CACHE_FLUSH_BIT | if (device->info->ver < 20) {
ANV_PIPE_DATA_CACHE_FLUSH_BIT; pipe_bits |= ANV_PIPE_DATA_CACHE_FLUSH_BIT |
ANV_PIPE_TILE_CACHE_FLUSH_BIT;
}
break; break;
case VK_ACCESS_2_INDEX_READ_BIT: case VK_ACCESS_2_INDEX_READ_BIT:
case VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT: case VK_ACCESS_2_VERTEX_ATTRIBUTE_READ_BIT:
@ -4084,8 +4091,13 @@ anv_pipe_invalidate_bits_for_access_flags(struct anv_cmd_buffer *cmd_buffer,
* any in-flight flush operations have completed. * any in-flight flush operations have completed.
*/ */
pipe_bits |= ANV_PIPE_CS_STALL_BIT; pipe_bits |= ANV_PIPE_CS_STALL_BIT;
/* Prior to Gfx20, CS is not L3 coherent, so make the data available
* for it by flushing L3.
*/
if (device->info->ver < 20) {
pipe_bits |= ANV_PIPE_TILE_CACHE_FLUSH_BIT; pipe_bits |= ANV_PIPE_TILE_CACHE_FLUSH_BIT;
pipe_bits |= ANV_PIPE_DATA_CACHE_FLUSH_BIT; pipe_bits |= ANV_PIPE_DATA_CACHE_FLUSH_BIT;
}
break; break;
case VK_ACCESS_2_HOST_READ_BIT: case VK_ACCESS_2_HOST_READ_BIT:
/* We're transitioning a buffer that was written by CPU. Flush /* We're transitioning a buffer that was written by CPU. Flush
@ -4099,8 +4111,10 @@ anv_pipe_invalidate_bits_for_access_flags(struct anv_cmd_buffer *cmd_buffer,
* tile cache flush to make sure any previous write is not going to * tile cache flush to make sure any previous write is not going to
* create WaW hazards. * create WaW hazards.
*/ */
if (device->info->ver < 20) {
pipe_bits |= ANV_PIPE_DATA_CACHE_FLUSH_BIT; pipe_bits |= ANV_PIPE_DATA_CACHE_FLUSH_BIT;
pipe_bits |= ANV_PIPE_TILE_CACHE_FLUSH_BIT; pipe_bits |= ANV_PIPE_TILE_CACHE_FLUSH_BIT;
}
break; break;
case VK_ACCESS_2_SHADER_STORAGE_READ_BIT: case VK_ACCESS_2_SHADER_STORAGE_READ_BIT:
case VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR: case VK_ACCESS_2_ACCELERATION_STRUCTURE_READ_BIT_KHR: