Re: [PATCH 1/8] media: hantro: Trace hevc hw cycles performance register

Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxxxxx> · Mon, 14 Jun 2021 09:45:45 +0200

Le 13/06/2021 à 11:55, Hans Verkuil a écrit :
On 13/06/2021 11:53, Hans Verkuil wrote:
On 04/06/2021 15:06, Benjamin Gaignard wrote:
After each hevc decoded frame trace the hardware performance.
It provides the number of hw cycles spend per decoded macroblock.

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@xxxxxxxxxxxxx>
---
  drivers/staging/media/hantro/hantro_drv.c     |  3 ++
  .../staging/media/hantro/hantro_g2_hevc_dec.c | 16 ++++++++
  drivers/staging/media/hantro/hantro_g2_regs.h |  1 +
  drivers/staging/media/hantro/hantro_hw.h      |  1 +
  drivers/staging/media/hantro/imx8m_vpu_hw.c   |  1 +
  drivers/staging/media/hantro/trace.h          | 40 +++++++++++++++++++
Can you rename this to hantro_trace.h? I prefer to have the driver prefix in the name.
Ah, I accidentally replied to the v1, but the same comment applies to v2.

I have fix that, it will be in v3.
I just wait for more feedback before send it.

Thanks,
Benjamin


Regards,

	Hans

Regards,

	Hans

  6 files changed, 62 insertions(+)
  create mode 100644 drivers/staging/media/hantro/trace.h

diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index dbc69ee0b562..6053c86b1c3f 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -28,6 +28,9 @@
  #include "hantro.h"
  #include "hantro_hw.h"
  
+#define CREATE_TRACE_POINTS
+#include "trace.h"
+
  #define DRIVER_NAME "hantro-vpu"
  
  int hantro_debug;
diff --git a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
index 340efb57fd18..89fac5146433 100644
--- a/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
+++ b/drivers/staging/media/hantro/hantro_g2_hevc_dec.c
@@ -7,6 +7,7 @@
  
  #include "hantro_hw.h"
  #include "hantro_g2_regs.h"
+#include "trace.h"
  
  #define HEVC_DEC_MODE	0xC
  
@@ -22,6 +23,21 @@ static inline void hantro_write_addr(struct hantro_dev *vpu,
  	vdpu_write(vpu, addr & 0xffffffff, offset);
  }
  
+void hantro_g2_hevc_dec_done(struct hantro_ctx *ctx)
+{
+	const struct hantro_hevc_dec_ctrls *ctrls = &ctx->hevc_dec.ctrls;
+	const struct v4l2_ctrl_hevc_sps *sps = ctrls->sps;
+	struct hantro_dev *vpu = ctx->dev;
+	u32 hw_cycles = 0;
+	u32 mbs = (sps->pic_width_in_luma_samples *
+		   sps->pic_height_in_luma_samples) >> 8;
+
+	if (mbs)
+		hw_cycles = vdpu_read(vpu, G2_HW_PERFORMANCE) / mbs;
+
+	trace_hantro_hevc_perf(ctx, hw_cycles);
+}
+
  static void prepare_tile_info_buffer(struct hantro_ctx *ctx)
  {
  	struct hantro_dev *vpu = ctx->dev;
diff --git a/drivers/staging/media/hantro/hantro_g2_regs.h b/drivers/staging/media/hantro/hantro_g2_regs.h
index bb22fa921914..17d84ec9c5c2 100644
--- a/drivers/staging/media/hantro/hantro_g2_regs.h
+++ b/drivers/staging/media/hantro/hantro_g2_regs.h
@@ -177,6 +177,7 @@
  #define G2_REG_CONFIG_DEC_CLK_GATE_E		BIT(16)
  #define G2_REG_CONFIG_DEC_CLK_GATE_IDLE_E	BIT(17)
  
+#define G2_HW_PERFORMANCE	(G2_SWREG(63))
  #define G2_ADDR_DST		(G2_SWREG(65))
  #define G2_REG_ADDR_REF(i)	(G2_SWREG(67)  + ((i) * 0x8))
  #define G2_ADDR_DST_CHR		(G2_SWREG(99))
diff --git a/drivers/staging/media/hantro/hantro_hw.h b/drivers/staging/media/hantro/hantro_hw.h
index 5737a7707944..8fa0aacb61cd 100644
--- a/drivers/staging/media/hantro/hantro_hw.h
+++ b/drivers/staging/media/hantro/hantro_hw.h
@@ -240,6 +240,7 @@ void hantro_h264_dec_exit(struct hantro_ctx *ctx);
  int hantro_hevc_dec_init(struct hantro_ctx *ctx);
  void hantro_hevc_dec_exit(struct hantro_ctx *ctx);
  int hantro_g2_hevc_dec_run(struct hantro_ctx *ctx);
+void hantro_g2_hevc_dec_done(struct hantro_ctx *ctx);
  int hantro_hevc_dec_prepare_run(struct hantro_ctx *ctx);
  dma_addr_t hantro_hevc_get_ref_buf(struct hantro_ctx *ctx, int poc);
  void hantro_hevc_ref_remove_unused(struct hantro_ctx *ctx);
diff --git a/drivers/staging/media/hantro/imx8m_vpu_hw.c b/drivers/staging/media/hantro/imx8m_vpu_hw.c
index ea919bfb9891..7e9e24bb5057 100644
--- a/drivers/staging/media/hantro/imx8m_vpu_hw.c
+++ b/drivers/staging/media/hantro/imx8m_vpu_hw.c
@@ -239,6 +239,7 @@ static const struct hantro_codec_ops imx8mq_vpu_g2_codec_ops[] = {
  		.reset = imx8m_vpu_g2_reset,
  		.init = hantro_hevc_dec_init,
  		.exit = hantro_hevc_dec_exit,
+		.done = hantro_g2_hevc_dec_done,
  	},
  };
  
diff --git a/drivers/staging/media/hantro/trace.h b/drivers/staging/media/hantro/trace.h
new file mode 100644
index 000000000000..8abe5ddb4814
--- /dev/null
+++ b/drivers/staging/media/hantro/trace.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hantro
+
+#if !defined(__HANTRO_TRACE_H__) || defined(TRACE_HEADER_MULTI_READ)
+#define __HANTRO_TRACE_H__
+
+#include <linux/tracepoint.h>
+#include <media/videobuf2-v4l2.h>
+
+#include "hantro.h"
+
+TRACE_EVENT(hantro_hevc_perf,
+	TP_PROTO(struct hantro_ctx *ctx, u32 hw_cycles),
+
+	TP_ARGS(ctx, hw_cycles),
+
+	TP_STRUCT__entry(
+		__field(int, minor)
+		__field(u32, hw_cycles)
+	),
+
+	TP_fast_assign(
+		__entry->minor = ctx->fh.vdev->minor;
+		__entry->hw_cycles = hw_cycles;
+	),
+
+	TP_printk("minor = %d, %8d cycles / mb",
+		  __entry->minor, __entry->hw_cycles)
+);
+
+#endif /* __HANTRO_TRACE_H__ */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH ../../drivers/staging/media/hantro
+#undef TRACE_INCLUDE_FILE
+#define TRACE_INCLUDE_FILE trace
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>







