From aa737e124ca4d38e6b7716965b7d6544f39f9618 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 27 Jun 2024 17:11:39 +0300 Subject: [PATCH] anv: fix u_trace on < Gfx12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lionel Landwerlin Fixes: 3984875792 ("u_trace: extend tracepoint end_of_pipe bit into flags") Reviewed-by: José Roberto de Souza Part-of: --- src/intel/vulkan/anv_utrace.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c index 55fff661260..9bdef833147 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -354,15 +354,17 @@ anv_utrace_record_ts(struct u_trace *ut, void *cs, cs == NULL && (flags & INTEL_DS_TRACEPOINT_FLAG_END_OF_PIPE_CS); - assert(!is_end_compute || + assert(device->info->verx10 < 125 || + !is_end_compute || cmd_buffer->state.last_indirect_dispatch != NULL || cmd_buffer->state.last_compute_walker != NULL); enum anv_timestamp_capture_type capture_type = - is_end_compute ? + (device->info->verx10 >= 125 && is_end_compute) ? (cmd_buffer->state.last_indirect_dispatch != NULL ? ANV_TIMESTAMP_REWRITE_INDIRECT_DISPATCH : ANV_TIMESTAMP_REWRITE_COMPUTE_WALKER) : - (flags & INTEL_DS_TRACEPOINT_FLAG_END_OF_PIPE) ? + (flags & (INTEL_DS_TRACEPOINT_FLAG_END_OF_PIPE | + INTEL_DS_TRACEPOINT_FLAG_END_OF_PIPE_CS)) ? ANV_TIMESTAMP_CAPTURE_END_OF_PIPE : ANV_TIMESTAMP_CAPTURE_TOP_OF_PIPE;