From patchwork Fri Oct 30 09:00:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 10311 X-Patchwork-Delegate: paul.elder@ideasonboard.com Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E71F1BDB9B for ; Fri, 30 Oct 2020 09:00:52 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7306862979; Fri, 30 Oct 2020 10:00:52 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Q7pr6PM9"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D967662034 for ; Fri, 30 Oct 2020 10:00:51 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 0955A3D; Fri, 30 Oct 2020 10:00:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1604048451; bh=VPxbW9nIzNNPXl5t6gWyTWv03DcKB83LDcSH4RAiLP0=; h=From:To:Cc:Subject:Date:From; b=Q7pr6PM9QNSgeJKr+3CqAQtJUkvdINXb3ObAw9w999amsIHJGyLsIjhUlrEJnqNB1 2EUe62xygU5wvVPTBbGEtdlV+iBZhxgP80QKMqRH5KnEqw+8RztvjmHh3C8qs8mJtP Wodij8JhRwVzC6sVZp2KlOkgOdE4OwBATW203kiE= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 30 Oct 2020 18:00:42 +0900 Message-Id: <20201030090042.79557-1-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4] pipeline: raspberrypi: Add IPA call tracepoints X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Emit tracepoints for IPA calls in the raspberrypi pipeline handler, to allow profiling of IPA calls. Signed-off-by: Paul Elder Reviewed-by: Laurent Pinchart --- This patch has been broken out from the rest of the tracing patchset because it depends on IPC, while the others don't. (Unless we want a different pre-IPC version of this patch?) No change in v4 Changes in v3: - rename the tracepoints to ipa_call_begin and ipa_call_end - remove the char * casts for the strings passed to the tracepoints - use the new ipa call tracepoint macros New in v2 --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 0a5a7288..07c9c25a 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -31,6 +31,7 @@ #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/tracepoints.h" #include "libcamera/internal/utils.h" #include "libcamera/internal/v4l2_controls.h" #include "libcamera/internal/v4l2_videodevice.h" @@ -1240,6 +1241,8 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config) void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList &controls) { + LIBCAMERA_TRACEPOINT_IPA_END(rpi, signalStatReady); + if (state_ == State::Stopped) handleState(); @@ -1273,6 +1276,8 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList & void RPiCameraData::runIsp(uint32_t bufferId) { + LIBCAMERA_TRACEPOINT_IPA_END(rpi, signalIspPrepare); + if (state_ == State::Stopped) handleState(); @@ -1406,6 +1411,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer) * application until after the IPA signals so. */ if (stream == &isp_[Isp::Stats]) { + LIBCAMERA_TRACEPOINT_IPA_BEGIN(rpi, signalStatReady); ipa_->signalStatReady(RPi::BufferMask::STATS | static_cast(index)); } else { /* Any other ISP output can be handed back to the application now. */ @@ -1658,7 +1664,9 @@ void RPiCameraData::tryRunPipeline() * queue the ISP output buffer listed in the request to start the HW * pipeline. */ + LIBCAMERA_TRACEPOINT_IPA_BEGIN(rpi, signalQueueRequest); ipa_->signalQueueRequest(request->controls()); + LIBCAMERA_TRACEPOINT_IPA_END(rpi, signalQueueRequest); /* Ready to use the buffers, pop them off the queue. */ bayerQueue_.pop(); @@ -1677,6 +1685,7 @@ void RPiCameraData::tryRunPipeline() ipa::rpi::IspPreparePayload ispPrepare; ispPrepare.embeddedbufferId_ = RPi::BufferMask::EMBEDDED_DATA | embeddedId; ispPrepare.bayerbufferId_ = RPi::BufferMask::BAYER_DATA | bayerId; + LIBCAMERA_TRACEPOINT_IPA_BEGIN(rpi, signalIspPrepare); ipa_->signalIspPrepare(ispPrepare); }