From 086b50078d1b38839d5f1c3bf1d568bdfab59fba Mon Sep 17 00:00:00 2001 From: Mark Collins Date: Thu, 20 Oct 2022 12:13:51 +0000 Subject: [PATCH] common/utrace: Rename `u_trace_context_actively_tracing` to `u_trace_should_process` Signed-off-by: Mark Collins Reviewed-by: Danylo Piliaiev Reviewed-by: Yonggang Luo Ack-by: Chia-I Wu Part-of: --- src/freedreno/vulkan/tu_drm.c | 2 +- src/gallium/drivers/iris/iris_batch.c | 2 +- src/intel/ds/intel_driver_ds.cc | 2 +- src/intel/vulkan/anv_utrace.c | 2 +- src/intel/vulkan_hasvk/anv_utrace.c | 2 +- src/util/perf/u_trace.h | 5 ++++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_drm.c index 9a57c664492..872df710a82 100644 --- a/src/freedreno/vulkan/tu_drm.c +++ b/src/freedreno/vulkan/tu_drm.c @@ -974,7 +974,7 @@ tu_queue_submit_create_locked(struct tu_queue *queue, { VkResult result; - bool u_trace_enabled = u_trace_context_actively_tracing(&queue->device->trace_context); + bool u_trace_enabled = u_trace_should_process(&queue->device->trace_context); bool has_trace_points = false; struct vk_command_buffer **vk_cmd_buffers = vk_submit->command_buffers; diff --git a/src/gallium/drivers/iris/iris_batch.c b/src/gallium/drivers/iris/iris_batch.c index 850d008f56d..42451b28140 100644 --- a/src/gallium/drivers/iris/iris_batch.c +++ b/src/gallium/drivers/iris/iris_batch.c @@ -1088,7 +1088,7 @@ _iris_batch_flush(struct iris_batch *batch, const char *file, int line) iris_bo_wait_rendering(batch->bo); /* if execbuf failed; this is a nop */ } - if (u_trace_context_actively_tracing(&ice->ds.trace_context)) + if (u_trace_should_process(&ice->ds.trace_context)) iris_utrace_flush(batch, submission_id); /* Start a new batch buffer. */ diff --git a/src/intel/ds/intel_driver_ds.cc b/src/intel/ds/intel_driver_ds.cc index 344e7ed2145..5360157f6e3 100644 --- a/src/intel/ds/intel_driver_ds.cc +++ b/src/intel/ds/intel_driver_ds.cc @@ -452,7 +452,7 @@ void intel_ds_end_submit(struct intel_ds_queue *queue, uint64_t start_ts) { - if (!u_trace_context_actively_tracing(&queue->device->trace_context)) { + if (!u_trace_should_process(&queue->device->trace_context)) { queue->device->sync_gpu_ts = 0; queue->device->next_clock_sync_ns = 0; return; diff --git a/src/intel/vulkan/anv_utrace.c b/src/intel/vulkan/anv_utrace.c index 81f46e542c3..898c9180541 100644 --- a/src/intel/vulkan/anv_utrace.c +++ b/src/intel/vulkan/anv_utrace.c @@ -31,7 +31,7 @@ command_buffers_count_utraces(struct anv_device *device, struct anv_cmd_buffer **cmd_buffers, uint32_t *utrace_copies) { - if (!u_trace_context_actively_tracing(&device->ds.trace_context)) + if (!u_trace_should_process(&device->ds.trace_context)) return 0; uint32_t utraces = 0; diff --git a/src/intel/vulkan_hasvk/anv_utrace.c b/src/intel/vulkan_hasvk/anv_utrace.c index 81f46e542c3..898c9180541 100644 --- a/src/intel/vulkan_hasvk/anv_utrace.c +++ b/src/intel/vulkan_hasvk/anv_utrace.c @@ -31,7 +31,7 @@ command_buffers_count_utraces(struct anv_device *device, struct anv_cmd_buffer **cmd_buffers, uint32_t *utrace_copies) { - if (!u_trace_context_actively_tracing(&device->ds.trace_context)) + if (!u_trace_should_process(&device->ds.trace_context)) return 0; uint32_t utraces = 0; diff --git a/src/util/perf/u_trace.h b/src/util/perf/u_trace.h index 1f9e99ee392..a8c6d2f0306 100644 --- a/src/util/perf/u_trace.h +++ b/src/util/perf/u_trace.h @@ -318,8 +318,11 @@ u_trace_enabled(struct u_trace_context *utctx) { return p_atomic_read_relaxed(&utctx->enabled_traces) != 0; } +/** + * Return whether chunks should be processed or not. + */ static ALWAYS_INLINE bool -u_trace_context_actively_tracing(struct u_trace_context *utctx) { +u_trace_should_process(struct u_trace_context *utctx) { return p_atomic_read_relaxed(&utctx->enabled_traces) & U_TRACE_TYPE_REQUIRE_PROCESSING; }