From patchwork Tue Feb 24 19:37:42 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 26233 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 1AAE7C0DA4 for ; Tue, 24 Feb 2026 19:37:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B8BF8622E3; Tue, 24 Feb 2026 20:37:54 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="o7AYJKKg"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Cc3+kVW6"; dkim-atps=neutral Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EF724622AE for ; Tue, 24 Feb 2026 20:37:51 +0100 (CET) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61OICGh2057305 for ; Tue, 24 Feb 2026 19:37:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=5//7ZazaTSh rjC8C7EEiB8EeyQWURuIBSfCyUyz5LZc=; b=o7AYJKKgsZNLQ6cS8PoG0twOOZZ /Dat3Ms9ylGPzfbMAEI2dqd8pCRNOoXA3yYFgHFhw6BlwDE1fgaz0fpVGoziV9JJ Lfpus86QRAiOly2yZdIBnIF63WUGpAHBwyawerun4sAOBGkxQxW8egKs1PcWRKs4 ElDwTN7qcIAuJlXGEiD+e+sN8plmZN9o49j4JIkqckQDHE3BZRKMPFXlWImf6Z/Y gdYQKPnu6IbyGjMXhSK0QYQIyz3hhDtCHf1lTf37hCe5oA1gDK5JIEvLs4wOVE0R aL9HCGwF5ksYMpqq4YRsAFlCDBoCpt2kXWSasm4orxhVmrdmUSsUuJ4z6JA== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ch9sa9vxk-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 24 Feb 2026 19:37:50 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-8c7166a4643so5440105685a.0 for ; Tue, 24 Feb 2026 11:37:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1771961869; x=1772566669; darn=lists.libcamera.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5//7ZazaTShrjC8C7EEiB8EeyQWURuIBSfCyUyz5LZc=; b=Cc3+kVW6W7cRNmn2dX5YtL8qXIzO8V12ByUfOSthj7uJhK/WlUPv67N9VDTHff35Ki dqWTc4zVPGC9Q3WM4xFoNaGt8w2MsSxa2jqEyi7yDeesZ0hsHXgO93jV/z5d6fqBNajh KtAT2ikI7GLmxTrV0c0T4vH05SSz3XzNr6bVpv7ENr+CkJtGQ63+b9NX9xAXVnPE8U9P Lclw7j5RePUa27PQ9s2rjQDBJ//mSu42UHvzya7YJOEe+kSEZcLyA/kRem1Zl3TqLGFv AFkRQa3brUf+vh4CRVmcmqgwV0Ug2rOfCehKnXWlXFSl70MM2iSC/bnvKrc9budA6YIA S4xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771961869; x=1772566669; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5//7ZazaTShrjC8C7EEiB8EeyQWURuIBSfCyUyz5LZc=; b=LnHerFfOlJc7QIUtVzMocRazY+AdTU8Uzfc0ROMXlLfe+O/KaG8Q9ixCm/9JxLoY/I 4Uad7EIFcT0BFKFbPnk5tybruO5Z0bqPsWRBVjpnhZ9x9CqThQI4DrCOOCryPm+KIbEE stlWa3glofzs8yTbYpAS/nfdjL7j8a00PXyj9Vg8DiuYVjFZwvGDKgsD7IGm7QzM//F+ NkdjwopsQtu3CjgVSoCbDI95ktQuTrIYEc28EF4vgq/56+kTwJcScKDj6NBwWYpo815J 5mtre6lU9h6m/Q/wNSmFUQDRw2EfQCAyvsMqoBe+ODSExMv3GLEy49gndQSb/DWEkFAy xaXg== X-Gm-Message-State: AOJu0Yydns8TRdGJrODFQ7m/ZOPHyPAp2MQAVbzOFOzWXyBTCPvNgRCm Q/6UCWj8f8OB3a6Yfe46wOgB10kUKUltaZxnPFwaJbHQWyoToL0zr5ou7q+UXZ4AOrV0ohWI2g4 F/JgR2nl7B7Z3tuZ50MJE1HWhGuaPtRH/PqiE4sTO4h6pOrrTWXWcjYgRV5jzffgvl2tSYfu7qU Y0bCkoLJxQ X-Gm-Gg: AZuq6aJ2jklwrgo1elPCBgrrH59y8rAw5etwmnYefTFUYTxLJKuJ0DvyhLL59vfGIxR DmlnjTNNnDrv02ECdNYxTzKBeFAfSIareMAYCPY8+iZUt+a9toyRGqnC8FyqNkuGJGhotz97Vap YkeCvNZsNCYpzSCVuiWRlqC+xKfw/84xI5Xy58IOSaqj4yXpgQ7QBcn1XHTA82Ks9lvXjuS1Y7W d9fKjJVvuSTEu+hkTmuHG+Lft64wqSFGa1v39Danqqd78V9gPZQhbjd5SKrbhfU6e9rENAeD03Y HsDZfr4PAVF1zqoICmWcEg2N0irkWD3uSh5hrdDWNXHh1A8viaqNZRNDxHXHCE5KD/VpTAsBAHZ Zd731dR/jY1EjdEoWQDSDx2wzhat6hobOJMDncPZPx74DfSwTmUbNsSIxmrTYr+hkVoZokB/Pte juaDjS9sjC5SXELM3oBOiABDh24kWM33TfDuWC X-Received: by 2002:a05:620a:f04:b0:8ca:3d7c:e74a with SMTP id af79cd13be357-8cb8ca7fac2mr1343406085a.56.1771961868792; Tue, 24 Feb 2026 11:37:48 -0800 (PST) X-Received: by 2002:a05:620a:f04:b0:8ca:3d7c:e74a with SMTP id af79cd13be357-8cb8ca7fac2mr1343401685a.56.1771961868104; Tue, 24 Feb 2026 11:37:48 -0800 (PST) Received: from shalem (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9084e8cb3fsm458232866b.48.2026.02.24.11.37.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 11:37:47 -0800 (PST) From: Hans de Goede To: libcamera-devel@lists.libcamera.org, Milan Zamazal Cc: Hans de Goede Subject: [PATCH v3 1/4] software_isp: swstats_cpu: Prepare for multi-threading support Date: Tue, 24 Feb 2026 20:37:42 +0100 Message-ID: <20260224193745.106186-2-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260224193745.106186-1-johannes.goede@oss.qualcomm.com> References: <20260224193745.106186-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjI0MDE2OCBTYWx0ZWRfX96OtKGSsy2Px UFl/K4SyfGxY7wOJtgJU4w5OiGMEjvrcIpA1AF03mUm58k4loyjaSHT0VH+dB7vyCF61w6RXRtC aoZM95J8BI3rEUxN8p3CAwy689IVi1hFk3+LqUImIf+MXXi+o0KM1Wo0g68aE2Qfjw1YYk0lWJ1 NkAeYTMnHxHUl27TymDL7U4ZEzHcdgUId704hKg82NW2mWa0gTJ5m4efXnWbb6T6vMSfq6SnYVz XdtEpT5f9hkdb/6fbfVgUHQurNAIOWd+TaLFKJXg5RZNOt7+xMcCKxHZ11rJ3DKxRjs49WszBAD Fn79sovGa+s8ltr1c9qMU4Z6n6CAeALYpWDCaFsd4pNnny2YrwiXWK6NyAE/T/L+0jNCEnL+VSc O9Pt3kwj5hTRuQVOmpKxkCSYjyXN4cAl1poLoZh8W1DFbX8C85TnMa2u+wGSXlMu7h1gG+u8ZQr cgSbF/zunQiAiDpwNew== X-Proofpoint-ORIG-GUID: Un7l6alY7RW7IOB1Mh72NltnAk4PR6zH X-Authority-Analysis: v=2.4 cv=e7ELiKp/ c=1 sm=1 tr=0 ts=699dfe0e cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=_K5XuSEh1TEqbUxoQ0s3:22 a=EUspDBNiAAAA:8 a=VvikW9XIONpR7lsxkDIA:9 a=NFOGd7dJGGMPyQGDc5-O:22 X-Proofpoint-GUID: Un7l6alY7RW7IOB1Mh72NltnAk4PR6zH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293, Aquarius:18.0.1121, Hydra:6.1.51, FMLib:17.12.100.49 definitions=2026-02-24_02,2026-02-23_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 adultscore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 spamscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602240168 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" Make the storage used to accumulate the RGB sums and the Y histogram value a vector of SwIspStats objects instead of a single object so that when using multi-threading every thread can use its own storage to collect intermediate stats to avoid cache-line bouncing. Benchmarking with the GPU-ISP which does separate swstats benchmarking, on the Arduino Uno-Q which has a weak CPU which is good for performance testing, shows 20ms to generate stats for a 3272x2464 frame both before and after this change. Signed-off-by: Hans de Goede --- Changes in v3: - Use for (auto &s : stats_) {} Changes in v2: - Move the allocation of the vector of SwIspStats objects to inside the SwStatsCpu class, controlled by a configure() arguments instead of making the caller allocate the objects --- .../internal/software_isp/swstats_cpu.h | 25 ++++----- src/libcamera/software_isp/swstats_cpu.cpp | 54 +++++++++++++------ 2 files changed, 50 insertions(+), 29 deletions(-) diff --git a/include/libcamera/internal/software_isp/swstats_cpu.h b/include/libcamera/internal/software_isp/swstats_cpu.h index 64b3e23f..feee92f9 100644 --- a/include/libcamera/internal/software_isp/swstats_cpu.h +++ b/include/libcamera/internal/software_isp/swstats_cpu.h @@ -12,6 +12,7 @@ #pragma once #include +#include #include @@ -51,13 +52,13 @@ public: const Size &patternSize() { return patternSize_; } - int configure(const StreamConfiguration &inputCfg); + int configure(const StreamConfiguration &inputCfg, unsigned int statsBufferCount = 1); void setWindow(const Rectangle &window); void startFrame(uint32_t frame); void finishFrame(uint32_t frame, uint32_t bufferId); void processFrame(uint32_t frame, uint32_t bufferId, FrameBuffer *input); - void processLine0(uint32_t frame, unsigned int y, const uint8_t *src[]) + void processLine0(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0) { if (frame % kStatPerNumFrames) return; @@ -66,10 +67,10 @@ public: y >= (window_.y + window_.height)) return; - (this->*stats0_)(src); + (this->*stats0_)(src, stats_[statsBufferIndex]); } - void processLine2(uint32_t frame, unsigned int y, const uint8_t *src[]) + void processLine2(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0) { if (frame % kStatPerNumFrames) return; @@ -78,25 +79,25 @@ public: y >= (window_.y + window_.height)) return; - (this->*stats2_)(src); + (this->*stats2_)(src, stats_[statsBufferIndex]); } Signal statsReady; private: - using statsProcessFn = void (SwStatsCpu::*)(const uint8_t *src[]); + using statsProcessFn = void (SwStatsCpu::*)(const uint8_t *src[], SwIspStats &stats); using processFrameFn = void (SwStatsCpu::*)(MappedFrameBuffer &in); int setupStandardBayerOrder(BayerFormat::Order order); /* Bayer 8 bpp unpacked */ - void statsBGGR8Line0(const uint8_t *src[]); + void statsBGGR8Line0(const uint8_t *src[], SwIspStats &stats); /* Bayer 10 bpp unpacked */ - void statsBGGR10Line0(const uint8_t *src[]); + void statsBGGR10Line0(const uint8_t *src[], SwIspStats &stats); /* Bayer 12 bpp unpacked */ - void statsBGGR12Line0(const uint8_t *src[]); + void statsBGGR12Line0(const uint8_t *src[], SwIspStats &stats); /* Bayer 10 bpp packed */ - void statsBGGR10PLine0(const uint8_t *src[]); - void statsGBRG10PLine0(const uint8_t *src[]); + void statsBGGR10PLine0(const uint8_t *src[], SwIspStats &stats); + void statsGBRG10PLine0(const uint8_t *src[], SwIspStats &stats); void processBayerFrame2(MappedFrameBuffer &in); @@ -116,8 +117,8 @@ private: unsigned int xShift_; unsigned int stride_; + std::vector stats_; SharedMemObject sharedStats_; - SwIspStats stats_; Benchmark bench_; }; diff --git a/src/libcamera/software_isp/swstats_cpu.cpp b/src/libcamera/software_isp/swstats_cpu.cpp index 1cedcfbc..41b73e43 100644 --- a/src/libcamera/software_isp/swstats_cpu.cpp +++ b/src/libcamera/software_isp/swstats_cpu.cpp @@ -74,11 +74,12 @@ namespace libcamera { */ /** - * \fn void SwStatsCpu::processLine0(uint32_t frame, unsigned int y, const uint8_t *src[]) + * \fn void SwStatsCpu::processLine0(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0) * \brief Process line 0 * \param[in] frame The frame number * \param[in] y The y coordinate. * \param[in] src The input data. + * \param[in] statsBufferIndex Index of stats buffer to use for multi-threading. * * This function processes line 0 for input formats with * patternSize height == 1. @@ -97,14 +98,18 @@ namespace libcamera { * to the line in plane 0, etc. * * For non Bayer single plane input data only a single src pointer is required. + * + * The statsBufferIndex value must be less than the statsBufferCount value passed + * to configure(). */ /** - * \fn void SwStatsCpu::processLine2(uint32_t frame, unsigned int y, const uint8_t *src[]) + * \fn void SwStatsCpu::processLine2(uint32_t frame, unsigned int y, const uint8_t *src[], unsigned int statsBufferIndex = 0) * \brief Process line 2 and 3 * \param[in] frame The frame number * \param[in] y The y coordinate. * \param[in] src The input data. + * \param[in] statsBufferIndex Index of stats buffer to use for multi-threading. * * This function processes line 2 and 3 for input formats with * patternSize height == 4. @@ -182,14 +187,14 @@ static constexpr unsigned int kBlueYMul = 29; /* 0.114 * 256 */ yVal = r * kRedYMul; \ yVal += g * kGreenYMul; \ yVal += b * kBlueYMul; \ - stats_.yHistogram[yVal * SwIspStats::kYHistogramSize / (256 * 256 * (div))]++; + stats.yHistogram[yVal * SwIspStats::kYHistogramSize / (256 * 256 * (div))]++; #define SWSTATS_FINISH_LINE_STATS() \ - stats_.sum_.r() += sumR; \ - stats_.sum_.g() += sumG; \ - stats_.sum_.b() += sumB; + stats.sum_.r() += sumR; \ + stats.sum_.g() += sumG; \ + stats.sum_.b() += sumB; -void SwStatsCpu::statsBGGR8Line0(const uint8_t *src[]) +void SwStatsCpu::statsBGGR8Line0(const uint8_t *src[], SwIspStats &stats) { const uint8_t *src0 = src[1] + window_.x; const uint8_t *src1 = src[2] + window_.x; @@ -214,7 +219,7 @@ void SwStatsCpu::statsBGGR8Line0(const uint8_t *src[]) SWSTATS_FINISH_LINE_STATS() } -void SwStatsCpu::statsBGGR10Line0(const uint8_t *src[]) +void SwStatsCpu::statsBGGR10Line0(const uint8_t *src[], SwIspStats &stats) { const uint16_t *src0 = (const uint16_t *)src[1] + window_.x; const uint16_t *src1 = (const uint16_t *)src[2] + window_.x; @@ -240,7 +245,7 @@ void SwStatsCpu::statsBGGR10Line0(const uint8_t *src[]) SWSTATS_FINISH_LINE_STATS() } -void SwStatsCpu::statsBGGR12Line0(const uint8_t *src[]) +void SwStatsCpu::statsBGGR12Line0(const uint8_t *src[], SwIspStats &stats) { const uint16_t *src0 = (const uint16_t *)src[1] + window_.x; const uint16_t *src1 = (const uint16_t *)src[2] + window_.x; @@ -266,7 +271,7 @@ void SwStatsCpu::statsBGGR12Line0(const uint8_t *src[]) SWSTATS_FINISH_LINE_STATS() } -void SwStatsCpu::statsBGGR10PLine0(const uint8_t *src[]) +void SwStatsCpu::statsBGGR10PLine0(const uint8_t *src[], SwIspStats &stats) { const uint8_t *src0 = src[1] + window_.x * 5 / 4; const uint8_t *src1 = src[2] + window_.x * 5 / 4; @@ -292,7 +297,7 @@ void SwStatsCpu::statsBGGR10PLine0(const uint8_t *src[]) SWSTATS_FINISH_LINE_STATS() } -void SwStatsCpu::statsGBRG10PLine0(const uint8_t *src[]) +void SwStatsCpu::statsGBRG10PLine0(const uint8_t *src[], SwIspStats &stats) { const uint8_t *src0 = src[1] + window_.x * 5 / 4; const uint8_t *src1 = src[2] + window_.x * 5 / 4; @@ -332,8 +337,10 @@ void SwStatsCpu::startFrame(uint32_t frame) if (window_.width == 0) LOG(SwStatsCpu, Error) << "Calling startFrame() without setWindow()"; - stats_.sum_ = RGB({ 0, 0, 0 }); - stats_.yHistogram.fill(0); + for (auto &s : stats_) { + s.sum_ = RGB({ 0, 0, 0 }); + s.yHistogram.fill(0); + } } /** @@ -345,8 +352,19 @@ void SwStatsCpu::startFrame(uint32_t frame) */ void SwStatsCpu::finishFrame(uint32_t frame, uint32_t bufferId) { - stats_.valid = frame % kStatPerNumFrames == 0; - *sharedStats_ = stats_; + bool valid = frame % kStatPerNumFrames == 0; + + if (valid) { + sharedStats_->sum_ = RGB({ 0, 0, 0 }); + sharedStats_->yHistogram.fill(0); + for (auto &s : stats_) { + sharedStats_->sum_ += s.sum_; + for (unsigned int i = 0; i < SwIspStats::kYHistogramSize; i++) + sharedStats_->yHistogram[i] += s.yHistogram[i]; + } + } + + sharedStats_->valid = valid; statsReady.emit(frame, bufferId); } @@ -389,12 +407,14 @@ int SwStatsCpu::setupStandardBayerOrder(BayerFormat::Order order) /** * \brief Configure the statistics object for the passed in input format * \param[in] inputCfg The input format + * \param[in] statsBufferCount number of internal stats buffers to use for multi-threading * * \return 0 on success, a negative errno value on failure */ -int SwStatsCpu::configure(const StreamConfiguration &inputCfg) +int SwStatsCpu::configure(const StreamConfiguration &inputCfg, unsigned int statsBufferCount) { stride_ = inputCfg.stride; + stats_.resize(statsBufferCount); BayerFormat bayerFormat = BayerFormat::fromPixelFormat(inputCfg.pixelFormat); @@ -504,7 +524,7 @@ void SwStatsCpu::processBayerFrame2(MappedFrameBuffer &in) /* linePointers[0] is not used by any stats0_ functions */ linePointers[1] = src; linePointers[2] = src + stride_; - (this->*stats0_)(linePointers); + (this->*stats0_)(linePointers, stats_[0]); src += stride_ * 2; } }