video: driver: add buffer statistics logic
Added change to print etb, ebd, ftb, fbd, (ebd-etb), (fbd - etb), (etb-ftb) wallclock time in ms. It will help to debug perf issues. Change-Id: Ideaecb2d51763711d6628729aa0f9056d05f0d51 Signed-off-by: Govindaraj Rajagopal <quic_grajagop@quicinc.com>
This commit is contained in:
Govindaraj Rajagopal
committed by
Gerrit - the friendly Code Review server
Gerrit - the friendly Code Review server
parent
912a80b094
commit
473e46f0cc
@@ -481,6 +481,25 @@ void print_vb2_buffer(const char *str, struct msm_vidc_inst *inst,
|
||||
}
|
||||
}
|
||||
|
||||
static void print_buffer_stats(u32 tag, const char *tag_str, struct msm_vidc_inst *inst,
|
||||
struct msm_vidc_buffer_stats *stats)
|
||||
{
|
||||
if (!tag_str || !inst || !stats)
|
||||
return;
|
||||
|
||||
/* skip flushed buffer stats */
|
||||
if (!stats->etb_time_ms || !stats->ebd_time_ms ||
|
||||
!stats->ftb_time_ms || !stats->fbd_time_ms)
|
||||
return;
|
||||
|
||||
dprintk_inst(tag, tag_str, inst,
|
||||
"f.no %4u ts %16llu (etb ebd ftb fbd)ms %6u %6u %6u %6u (ebd-etb fbd-etb etb-ftb)ms %4d %4d %4d size %8u attr %#x\n",
|
||||
stats->frame_num, stats->timestamp, stats->etb_time_ms, stats->ebd_time_ms,
|
||||
stats->ftb_time_ms, stats->fbd_time_ms, stats->ebd_time_ms - stats->etb_time_ms,
|
||||
stats->fbd_time_ms - stats->etb_time_ms, stats->etb_time_ms - stats->ftb_time_ms,
|
||||
stats->data_size, stats->flags);
|
||||
}
|
||||
|
||||
static void __fatal_error(bool fatal)
|
||||
{
|
||||
WARN_ON(fatal);
|
||||
@@ -498,6 +517,135 @@ static int __strict_check(struct msm_vidc_core *core, const char *function)
|
||||
return fatal ? -EINVAL : 0;
|
||||
}
|
||||
|
||||
static u32 msm_vidc_get_buffer_stats_flag(struct msm_vidc_inst *inst)
|
||||
{
|
||||
u32 flags = 0;
|
||||
|
||||
if (inst->hfi_frame_info.data_corrupt)
|
||||
flags |= MSM_VIDC_STATS_FLAG_CORRUPT;
|
||||
|
||||
if (inst->hfi_frame_info.overflow)
|
||||
flags |= MSM_VIDC_STATS_FLAG_OVERFLOW;
|
||||
|
||||
if (inst->hfi_frame_info.no_output)
|
||||
flags |= MSM_VIDC_STATS_FLAG_NO_OUTPUT;
|
||||
|
||||
return flags;
|
||||
}
|
||||
|
||||
int msm_vidc_add_buffer_stats(struct msm_vidc_inst *inst,
|
||||
struct msm_vidc_buffer *buf)
|
||||
{
|
||||
struct msm_vidc_buffer_stats *stats = NULL;
|
||||
|
||||
if (!inst || !buf) {
|
||||
d_vpr_e("%s: invalid params\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* stats applicable only to input & output buffers */
|
||||
if (buf->type != MSM_VIDC_BUF_INPUT && buf->type != MSM_VIDC_BUF_OUTPUT)
|
||||
return -EINVAL;
|
||||
|
||||
/* update start timestamp */
|
||||
buf->start_time_ms = (ktime_get_ns() / 1000 - inst->initial_time_us) / 1000;
|
||||
|
||||
/* add buffer stats only in ETB path */
|
||||
if (buf->type != MSM_VIDC_BUF_INPUT)
|
||||
return 0;
|
||||
|
||||
stats = msm_memory_pool_alloc(inst, MSM_MEM_POOL_BUF_STATS);
|
||||
if (!stats)
|
||||
return -ENOMEM;
|
||||
INIT_LIST_HEAD(&stats->list);
|
||||
list_add_tail(&stats->list, &inst->buffer_stats_list);
|
||||
|
||||
stats->frame_num = inst->debug_count.etb;
|
||||
stats->timestamp = buf->timestamp;
|
||||
stats->etb_time_ms = buf->start_time_ms;
|
||||
if (is_decode_session(inst))
|
||||
stats->data_size = buf->data_size;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msm_vidc_remove_buffer_stats(struct msm_vidc_inst *inst,
|
||||
struct msm_vidc_buffer *buf)
|
||||
{
|
||||
struct msm_vidc_buffer_stats *stats = NULL, *dummy_stats = NULL;
|
||||
|
||||
if (!inst || !buf) {
|
||||
d_vpr_e("%s: invalid params\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* stats applicable only to input & output buffers */
|
||||
if (buf->type != MSM_VIDC_BUF_INPUT && buf->type != MSM_VIDC_BUF_OUTPUT)
|
||||
return -EINVAL;
|
||||
|
||||
/* update end timestamp */
|
||||
buf->end_time_ms = (ktime_get_ns() / 1000 - inst->initial_time_us) / 1000;
|
||||
|
||||
list_for_each_entry_safe(stats, dummy_stats, &inst->buffer_stats_list, list) {
|
||||
if (stats->timestamp == buf->timestamp) {
|
||||
if (buf->type == MSM_VIDC_BUF_INPUT) {
|
||||
/* skip - already updated(multiple input - single output case) */
|
||||
if (stats->ebd_time_ms)
|
||||
continue;
|
||||
|
||||
/* ebd: update end ts and return */
|
||||
stats->ebd_time_ms = buf->end_time_ms;
|
||||
stats->flags |= msm_vidc_get_buffer_stats_flag(inst);
|
||||
|
||||
/* remove entry - no output attached */
|
||||
if (stats->flags & MSM_VIDC_STATS_FLAG_NO_OUTPUT) {
|
||||
list_del_init(&stats->list);
|
||||
msm_memory_pool_free(inst, stats);
|
||||
}
|
||||
} else if (buf->type == MSM_VIDC_BUF_OUTPUT) {
|
||||
/* skip - ebd not arrived(single input - multiple output case) */
|
||||
if (!stats->ebd_time_ms)
|
||||
continue;
|
||||
|
||||
/* fbd: update end ts and remove entry */
|
||||
list_del_init(&stats->list);
|
||||
stats->ftb_time_ms = buf->start_time_ms;
|
||||
stats->fbd_time_ms = buf->end_time_ms;
|
||||
stats->flags |= msm_vidc_get_buffer_stats_flag(inst);
|
||||
if (is_encode_session(inst))
|
||||
stats->data_size = buf->data_size;
|
||||
|
||||
print_buffer_stats(VIDC_STAT, "stat", inst, stats);
|
||||
|
||||
msm_memory_pool_free(inst, stats);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int msm_vidc_flush_buffer_stats(struct msm_vidc_inst *inst)
|
||||
{
|
||||
struct msm_vidc_buffer_stats *stats, *dummy_stats;
|
||||
|
||||
if (!inst) {
|
||||
d_vpr_e("%s: invalid params\n", __func__);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
i_vpr_l(inst, "%s: flush buffer_stats list\n", __func__);
|
||||
list_for_each_entry_safe(stats, dummy_stats, &inst->buffer_stats_list, list) {
|
||||
list_del_init(&stats->list);
|
||||
msm_memory_pool_free(inst, stats);
|
||||
}
|
||||
|
||||
/* reset initial ts as well to avoid huge delta */
|
||||
inst->initial_time_us = ktime_get_ns() / 1000;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
enum msm_vidc_buffer_type v4l2_type_to_driver(u32 type, const char *func)
|
||||
{
|
||||
enum msm_vidc_buffer_type buffer_type = 0;
|
||||
@@ -3465,7 +3613,7 @@ void msm_vidc_print_stats(struct msm_vidc_inst *inst)
|
||||
achieved_fps = (fbd * 1000) / dt_ms;
|
||||
bitrate_kbps = (inst->stats.data_size * 8 * 1000) / (dt_ms * 1024);
|
||||
|
||||
i_vpr_hp(inst,
|
||||
i_vpr_hs(inst,
|
||||
"stats: counts (etb,ebd,ftb,fbd): %u %u %u %u (total %llu %llu %llu %llu), achieved bitrate %lldKbps fps %u/s, frame rate %u, operating rate %u, priority %u, dt %ums\n",
|
||||
etb, ebd, ftb, fbd, inst->debug_count.etb, inst->debug_count.ebd,
|
||||
inst->debug_count.ftb, inst->debug_count.fbd,
|
||||
@@ -3677,6 +3825,9 @@ int msm_vidc_queue_buffer_single(struct msm_vidc_inst *inst, struct vb2_buffer *
|
||||
if (!buf)
|
||||
return -EINVAL;
|
||||
|
||||
/* update start timestamp */
|
||||
msm_vidc_add_buffer_stats(inst, buf);
|
||||
|
||||
if (is_meta_rx_inp_enabled(inst, META_OUTBUF_FENCE) &&
|
||||
is_output_buffer(buf->type)) {
|
||||
fence = msm_vidc_fence_create(inst);
|
||||
@@ -5641,6 +5792,7 @@ void msm_vidc_destroy_buffers(struct msm_vidc_inst *inst)
|
||||
struct msm_vidc_timestamp *ts, *dummy_ts;
|
||||
struct msm_memory_dmabuf *dbuf, *dummy_dbuf;
|
||||
struct msm_vidc_input_timer *timer, *dummy_timer;
|
||||
struct msm_vidc_buffer_stats *stats, *dummy_stats;
|
||||
struct msm_vidc_inst_cap_entry *entry, *dummy_entry;
|
||||
struct msm_vidc_fence *fence, *dummy_fence;
|
||||
|
||||
@@ -5731,6 +5883,12 @@ void msm_vidc_destroy_buffers(struct msm_vidc_inst *inst)
|
||||
msm_memory_pool_free(inst, timer);
|
||||
}
|
||||
|
||||
list_for_each_entry_safe(stats, dummy_stats, &inst->buffer_stats_list, list) {
|
||||
print_buffer_stats(VIDC_ERR, "err ", inst, stats);
|
||||
list_del(&stats->list);
|
||||
msm_memory_pool_free(inst, stats);
|
||||
}
|
||||
|
||||
list_for_each_entry_safe(dbuf, dummy_dbuf, &inst->dmabuf_tracker, list) {
|
||||
i_vpr_e(inst, "%s: removing dma_buf %#x, refcount %u\n",
|
||||
__func__, dbuf->dmabuf, dbuf->refcount);
|
||||
|
||||
Reference in New Issue
Block a user