From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03CBEC48BE8 for ; Sun, 13 Jun 2021 09:55:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2F3B610C8 for ; Sun, 13 Jun 2021 09:55:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231640AbhFMJ5g (ORCPT ); Sun, 13 Jun 2021 05:57:36 -0400 Received: from lb2-smtp-cloud8.xs4all.net ([194.109.24.25]:48121 "EHLO lb2-smtp-cloud8.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230255AbhFMJ5f (ORCPT ); Sun, 13 Jun 2021 05:57:35 -0400 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud8.xs4all.net with ESMTPA id sMq2lTzcLhqltsMq5liv08; Sun, 13 Jun 2021 11:55:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s2; t=1623578134; bh=fU8Ot0pWCiMdpCEERBQAaol5IDljg932bwWs+DnoffM=; h=Subject:From:To:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=HGCpEjT3M89/xZX8fIyiE1WRi2rsi/soZn1Wwgr2sgw3OvcL2gbHMaSC81fWVzQHS GIPTebClviw32DYc8VFkmPql0Cu5RSdjbevUzlod7L/sOiZWw4arOWobW7QfnP+wnF NMMlbsE870vranxaJ8XudPfNKGThCcJDdMdNlQrpSOU9oDBsMKdmvCcuxfUG+nuRps agy6iIFnKzdcSaWXWYrfC2LKuLUhhe5Nv5xO1A6xrk5HrwQOjSEGmQLCwm9ArSneEH /SoNsM97ufoIfrdc6uuV6oeg/oEN1VFuxadCQklY/ncOHkIRQQ+vvuQxNYIslJ38x0 N+2MoaMMk1P5g== Subject: Re: [PATCH 1/8] media: hantro: Trace hevc hw cycles performance register From: Hans Verkuil To: Benjamin Gaignard , ezequiel@collabora.com, p.zabel@pengutronix.de, mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@siol.net, emil.l.velikov@gmail.com, andrzej.p@collabora.com, jc@kynesim.co.uk Cc: kernel@pengutronix.de, linux-imx@nxp.com, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20210604130619.491200-1-benjamin.gaignard@collabora.com> <20210604130619.491200-2-benjamin.gaignard@collabora.com> Message-ID: <4066d940-4337-0b3d-5329-72c72bc5b623@xs4all.nl> Date: Sun, 13 Jun 2021 11:55:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-CMAE-Envelope: MS4xfMjIiihHdO2Qf9nYOiVqZxLKyH3O1UDw/ZPS1CzvLnmWRT7bnH94h0TrskliOdd/PtXSXvaW54EQgmnbDek8D4Ne+v9BewrJ8UMNebIz+TzFmnIBu7dl 8t+y5wLIUew/nkC3bhIRrBO//Al/Ebk8osO1XA2o+9qkoq1OHAQ7uSDBy/GbC24wE9dYYhbVBg38ld5hUYtEKpIHhNddIch7hl8ks4ySFUa/0TS5er77dF0o DmEM3ef9qv2TgQ2Rii1/jlkp7E2I63INHg40t3MhWBneMpDIpkUK6tJeDnnn5kHySdiH2ViOhywuMcXwAywPkYFyH/SFjWcgRK8OSkNQAEphgqN9vbXfr99K daWaUM/B0jwG7/HaRbhDJ1UiH+L6TrSzJrKTzoRkT/KtCyHIEsvsJRj1YyXD7Y5bqcPlMKpqpeDn7oyY4wniS3879tzgcbLrANESql91FvmKz65/L9YFZVPp XeFZ9xds75DevZBnc2H1+61PVymPSfbgvEy6f7QWbyomh3Lr1CEtdh7fSF+RLO7XZLVvuLU2hpzouggRLauC7l1e9FeW3+sHXgHk5bk85VIYHsvw06rxQowQ BqS6OvxOcQcC/k7/oNd2qk6JbmkMk42YRlIXCEvDmipQ6sGvv/iAHriwiPWrsA7ss+DhLWmXvLXqBLPx6cuXzulIksgyAtrhiXXNNRseK/+7C0Qt/48f2o0K +Cd7vtFSD86h1RpCWp5Qsz993F5yMkUkrpKUihQbpbXM3xXSWSO8oRPe7briqGnTm2qoIRLtdNW6xxOWHZq3BakSmPPGuS0/SSs8kkaKS2mjrTtGbUfty9ah 4TzQ2hmyK8AnbCZMa9Zm/y23YXxg2vvXZ0Kw4kX/YFGzouzts43lY9bWhwPjWAZv3eQaAGj70zVA7+ENvFqGKTRyyqWHKBjHOPZH0SRl Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> --- >> 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. 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 >> +#include >> + >> +#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 >> > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86959C48BDF for ; Sun, 13 Jun 2021 09:55:57 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 45C2E6124B for ; Sun, 13 Jun 2021 09:55:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45C2E6124B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xs4all.nl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:Cc:To:From:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=/RVKZgwVfnBESmSY72gnS2pxzFxq6G5F4G75AkGC9SQ=; b=OuNG+eNDmHo4ViwoXuxRl4DojW /jsboKWCKmzr2gXAd7WGgGGXTN3VwNqBuPdJ3FObFpuUegKaFGjo60JfLAN2Uo7FfGAJVHK3kpBLl wrJAwxd5FWjT76GJ+e6GPE5Z30qy/gkZkoVTeY6+Kok6mVPT7L5sBeL0oHpdItii/iiZ7eaC5zzLg ntwBv6fWYSRd33paQ+5PRWCyD9GwmBHGNh7WPPqOSa3tAXjZj92bLVDI6QyaaHeHvuF97Lm7t+U1D g4hUkVuX5BJ2mIOEaZSkrcZDFE9gOAnoxJmlWKURPfQtE/ozZ8y5jvbelAAj9Oueirdt520z75uhu JAblF4Yw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMqO-00AALN-MH; Sun, 13 Jun 2021 09:55:52 +0000 Received: from lb3-smtp-cloud8.xs4all.net ([194.109.24.29]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMq8-00AAFo-A8; Sun, 13 Jun 2021 09:55:38 +0000 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud8.xs4all.net with ESMTPA id sMq2lTzcLhqltsMq5liv08; Sun, 13 Jun 2021 11:55:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s2; t=1623578134; bh=fU8Ot0pWCiMdpCEERBQAaol5IDljg932bwWs+DnoffM=; h=Subject:From:To:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=HGCpEjT3M89/xZX8fIyiE1WRi2rsi/soZn1Wwgr2sgw3OvcL2gbHMaSC81fWVzQHS GIPTebClviw32DYc8VFkmPql0Cu5RSdjbevUzlod7L/sOiZWw4arOWobW7QfnP+wnF NMMlbsE870vranxaJ8XudPfNKGThCcJDdMdNlQrpSOU9oDBsMKdmvCcuxfUG+nuRps agy6iIFnKzdcSaWXWYrfC2LKuLUhhe5Nv5xO1A6xrk5HrwQOjSEGmQLCwm9ArSneEH /SoNsM97ufoIfrdc6uuV6oeg/oEN1VFuxadCQklY/ncOHkIRQQ+vvuQxNYIslJ38x0 N+2MoaMMk1P5g== Subject: Re: [PATCH 1/8] media: hantro: Trace hevc hw cycles performance register From: Hans Verkuil To: Benjamin Gaignard , ezequiel@collabora.com, p.zabel@pengutronix.de, mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@siol.net, emil.l.velikov@gmail.com, andrzej.p@collabora.com, jc@kynesim.co.uk Cc: kernel@pengutronix.de, linux-imx@nxp.com, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20210604130619.491200-1-benjamin.gaignard@collabora.com> <20210604130619.491200-2-benjamin.gaignard@collabora.com> Message-ID: <4066d940-4337-0b3d-5329-72c72bc5b623@xs4all.nl> Date: Sun, 13 Jun 2021 11:55:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CMAE-Envelope: MS4xfMjIiihHdO2Qf9nYOiVqZxLKyH3O1UDw/ZPS1CzvLnmWRT7bnH94h0TrskliOdd/PtXSXvaW54EQgmnbDek8D4Ne+v9BewrJ8UMNebIz+TzFmnIBu7dl 8t+y5wLIUew/nkC3bhIRrBO//Al/Ebk8osO1XA2o+9qkoq1OHAQ7uSDBy/GbC24wE9dYYhbVBg38ld5hUYtEKpIHhNddIch7hl8ks4ySFUa/0TS5er77dF0o DmEM3ef9qv2TgQ2Rii1/jlkp7E2I63INHg40t3MhWBneMpDIpkUK6tJeDnnn5kHySdiH2ViOhywuMcXwAywPkYFyH/SFjWcgRK8OSkNQAEphgqN9vbXfr99K daWaUM/B0jwG7/HaRbhDJ1UiH+L6TrSzJrKTzoRkT/KtCyHIEsvsJRj1YyXD7Y5bqcPlMKpqpeDn7oyY4wniS3879tzgcbLrANESql91FvmKz65/L9YFZVPp XeFZ9xds75DevZBnc2H1+61PVymPSfbgvEy6f7QWbyomh3Lr1CEtdh7fSF+RLO7XZLVvuLU2hpzouggRLauC7l1e9FeW3+sHXgHk5bk85VIYHsvw06rxQowQ BqS6OvxOcQcC/k7/oNd2qk6JbmkMk42YRlIXCEvDmipQ6sGvv/iAHriwiPWrsA7ss+DhLWmXvLXqBLPx6cuXzulIksgyAtrhiXXNNRseK/+7C0Qt/48f2o0K +Cd7vtFSD86h1RpCWp5Qsz993F5yMkUkrpKUihQbpbXM3xXSWSO8oRPe7briqGnTm2qoIRLtdNW6xxOWHZq3BakSmPPGuS0/SSs8kkaKS2mjrTtGbUfty9ah 4TzQ2hmyK8AnbCZMa9Zm/y23YXxg2vvXZ0Kw4kX/YFGzouzts43lY9bWhwPjWAZv3eQaAGj70zVA7+ENvFqGKTRyyqWHKBjHOPZH0SRl X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_025536_560612_68CDCA26 X-CRM114-Status: GOOD ( 17.14 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org 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 >> --- >> 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. 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 >> +#include >> + >> +#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 >> > _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F947C48BDF for ; Sun, 13 Jun 2021 09:56:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BEBA6102A for ; Sun, 13 Jun 2021 09:56:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5BEBA6102A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xs4all.nl Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date: Message-ID:References:Cc:To:From:Subject:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=LDzZBS5VUD11uOATJhmKD19HOzl31UPxnTMoVo3IVxw=; b=gNe1nOd0nUNJbMo+/mdSB/TZes rMeJrn4kPf8boPZeEW0B6fVSOYbdy/UqQ3KB7rcUUt8BqUxbnb1JIMDxMeDSBEWdcpKGUc2CTpHjS lcZAd6UHyFfdS1DX1TbxFEPO+HaVdkEnAKnievycDLnmlk0nGw9ev4xpRgBlB/zKgJXZsBcJoo8G9 3AgHIh9okDUYgKJcNO5GSqSIn+DbI+zXxa11+A8T0jwERPwUJlbsVbE69vGo/8H12HzHRDWgD42L8 wFGEnEvzdte3nAVTDviVHWDGWcIkJsiqO80G3RElLBfSPrplhG4gztbPACIafqmvhl1XH3XXQdJ19 KBHrlI+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMqD-00AAIP-Ph; Sun, 13 Jun 2021 09:55:41 +0000 Received: from lb3-smtp-cloud8.xs4all.net ([194.109.24.29]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lsMq8-00AAFo-A8; Sun, 13 Jun 2021 09:55:38 +0000 Received: from cust-b5b5937f ([IPv6:fc0c:c16d:66b8:757f:c639:739b:9d66:799d]) by smtp-cloud8.xs4all.net with ESMTPA id sMq2lTzcLhqltsMq5liv08; Sun, 13 Jun 2021 11:55:34 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xs4all.nl; s=s2; t=1623578134; bh=fU8Ot0pWCiMdpCEERBQAaol5IDljg932bwWs+DnoffM=; h=Subject:From:To:Message-ID:Date:MIME-Version:Content-Type:From: Subject; b=HGCpEjT3M89/xZX8fIyiE1WRi2rsi/soZn1Wwgr2sgw3OvcL2gbHMaSC81fWVzQHS GIPTebClviw32DYc8VFkmPql0Cu5RSdjbevUzlod7L/sOiZWw4arOWobW7QfnP+wnF NMMlbsE870vranxaJ8XudPfNKGThCcJDdMdNlQrpSOU9oDBsMKdmvCcuxfUG+nuRps agy6iIFnKzdcSaWXWYrfC2LKuLUhhe5Nv5xO1A6xrk5HrwQOjSEGmQLCwm9ArSneEH /SoNsM97ufoIfrdc6uuV6oeg/oEN1VFuxadCQklY/ncOHkIRQQ+vvuQxNYIslJ38x0 N+2MoaMMk1P5g== Subject: Re: [PATCH 1/8] media: hantro: Trace hevc hw cycles performance register From: Hans Verkuil To: Benjamin Gaignard , ezequiel@collabora.com, p.zabel@pengutronix.de, mchehab@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, festevam@gmail.com, gregkh@linuxfoundation.org, mripard@kernel.org, paul.kocialkowski@bootlin.com, wens@csie.org, jernej.skrabec@siol.net, emil.l.velikov@gmail.com, andrzej.p@collabora.com, jc@kynesim.co.uk Cc: kernel@pengutronix.de, linux-imx@nxp.com, linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20210604130619.491200-1-benjamin.gaignard@collabora.com> <20210604130619.491200-2-benjamin.gaignard@collabora.com> Message-ID: <4066d940-4337-0b3d-5329-72c72bc5b623@xs4all.nl> Date: Sun, 13 Jun 2021 11:55:30 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.10.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CMAE-Envelope: MS4xfMjIiihHdO2Qf9nYOiVqZxLKyH3O1UDw/ZPS1CzvLnmWRT7bnH94h0TrskliOdd/PtXSXvaW54EQgmnbDek8D4Ne+v9BewrJ8UMNebIz+TzFmnIBu7dl 8t+y5wLIUew/nkC3bhIRrBO//Al/Ebk8osO1XA2o+9qkoq1OHAQ7uSDBy/GbC24wE9dYYhbVBg38ld5hUYtEKpIHhNddIch7hl8ks4ySFUa/0TS5er77dF0o DmEM3ef9qv2TgQ2Rii1/jlkp7E2I63INHg40t3MhWBneMpDIpkUK6tJeDnnn5kHySdiH2ViOhywuMcXwAywPkYFyH/SFjWcgRK8OSkNQAEphgqN9vbXfr99K daWaUM/B0jwG7/HaRbhDJ1UiH+L6TrSzJrKTzoRkT/KtCyHIEsvsJRj1YyXD7Y5bqcPlMKpqpeDn7oyY4wniS3879tzgcbLrANESql91FvmKz65/L9YFZVPp XeFZ9xds75DevZBnc2H1+61PVymPSfbgvEy6f7QWbyomh3Lr1CEtdh7fSF+RLO7XZLVvuLU2hpzouggRLauC7l1e9FeW3+sHXgHk5bk85VIYHsvw06rxQowQ BqS6OvxOcQcC/k7/oNd2qk6JbmkMk42YRlIXCEvDmipQ6sGvv/iAHriwiPWrsA7ss+DhLWmXvLXqBLPx6cuXzulIksgyAtrhiXXNNRseK/+7C0Qt/48f2o0K +Cd7vtFSD86h1RpCWp5Qsz993F5yMkUkrpKUihQbpbXM3xXSWSO8oRPe7briqGnTm2qoIRLtdNW6xxOWHZq3BakSmPPGuS0/SSs8kkaKS2mjrTtGbUfty9ah 4TzQ2hmyK8AnbCZMa9Zm/y23YXxg2vvXZ0Kw4kX/YFGzouzts43lY9bWhwPjWAZv3eQaAGj70zVA7+ENvFqGKTRyyqWHKBjHOPZH0SRl X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210613_025536_560612_68CDCA26 X-CRM114-Status: GOOD ( 17.14 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 >> --- >> 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. 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 >> +#include >> + >> +#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 >> > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel