From patchwork Mon Feb 23 16:09:27 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: 26226 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 09C29BE175 for ; Mon, 23 Feb 2026 16:09:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 061E462293; Mon, 23 Feb 2026 17:09:38 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="h2Dz0XUi"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="dsLHR58Y"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 94063621CE for ; Mon, 23 Feb 2026 17:09:36 +0100 (CET) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 61NAX3F33698602 for ; Mon, 23 Feb 2026 16:09:35 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=2RrMTepel0f /n7pSHRAfooxWOp7CWavPYXh9mXTSMB4=; b=h2Dz0XUiqUQhM4AdDG9YhuR3cB9 EawSIHalryjNmdbjSq7snowYNbPWj31rga5N8b0Nmkkoxq13ZZMPqkd65DiwNIFh khZiW/TFiA0ZotnLbVFdXxemTTsGt5A2wG7nYx59Q37i8d203DEHaPvRqL5JfX6z y5E5zThE4lJ1GD9bQ3j85zrgz9ugLceLQG+oV2vk++4998D3an/mM1C8ZILBrgdV hZT7oPFHzp29A047oU4R5AJhGNpLJQm1bXQIEw2PVvR88nixd4BOd4uNHwtVWVix skp/qAAQ8FWcISpkJOI1+185hvdZAwNySbuhe8CLPeDVMCl3Iv9lBS3n1UQ== Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cgn8191e0-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 23 Feb 2026 16:09:35 +0000 (GMT) Received: by mail-vs1-f70.google.com with SMTP id ada2fe7eead31-5fdede3f1ceso65109217137.1 for ; Mon, 23 Feb 2026 08:09:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1771862974; x=1772467774; 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=2RrMTepel0f/n7pSHRAfooxWOp7CWavPYXh9mXTSMB4=; b=dsLHR58YMzTbiEmsxJi6OUh6OJRgjPJfjLaacn3uw32y6GQX3noACNW/GDyipeXMn8 C02Ius8y/iK4f1YfQiqwXXDnY8GSwngK+wnqnfWvhMC7OE1oPcBVr5pfL6yNmlXDMa60 coYwKa8CN9YEggHk8TFrZcMlvQyH+MqdivybzVuQUWRK8Jhai8Z+AVpnZDuAfLnvQjU5 IyvKtGeOFf0HUUJLGUZzg9CQhSUb9HUsRh7jZrnIRWkrYuCTguBD1XcMMbHklyBCDNoP CfRyJIy6O2jEILfHKPjm1Cx0tSLuBbr1I67gQAIsb798ButoLGxAowZ3SRmvZSMRigIV y4eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771862974; x=1772467774; 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=2RrMTepel0f/n7pSHRAfooxWOp7CWavPYXh9mXTSMB4=; b=X4ErM/TXSeEnTudWxrsTjUVlLxRP2WOxPEX+QtCXhIpqyDpgcKwp5WVD1sGgawIIHx lgBPzv6x2dwWGY0hTT2K9K1eCj02U6AqBbacz7h7OvGx8wcXxcOr/YTub9Q2wHPE/t5O LzaAb2a5G7GqKuL34mXoAAkEusqeJsw7i/Enm3c/iQy9+y3Wfqg3oROHnEIrkps/NTzO iEOYbeecXJTQGM+r6yi7JLBG32Oh+UAzgqr1V7Z6wsxcUvlm7T5r8Fo61AmNGt7CPAiJ FXXrfoBXZePukofRTsXDpwbN5mcTeqsAaS+iUrex+xueGO8GKCLqcMwVxw3m8+CKiQBU F9iA== X-Gm-Message-State: AOJu0Yxiwg6QTOzpjwx4+mA5ONRAqjL7e+Z4qsTzdmuQ8uA5t5SCyhr5 atHqDCzJmu+TDgf9lA94iaU9nmjbLBgjF4tdc90n1Tuhm7O9aV5wxfEftBwk1lYJMpDerCFOfjQ QpaRGLVIwhnSSVFsEKYZ1hoTQaWZVnI9G98ifYZ77QE2yRM154sfF+sHPHMbKpJ48r8rcBZ9Ao3 pE9uZY3cY8 X-Gm-Gg: AZuq6aJgHKc7RlfFalEZcCYq/hKh6+jTTHs7rSDGd8LCFvV2DggoChl/p+QtGAGe3Zq Wd18EpT0tPuiK7P9Hikg3ko0wLliaPeyfvLKAIICmuFxHzITcM1P7yG3rAirbOYURx1tcdVeQRz Q/2UrXpqfZLJQqK9yZo/zHqEught57SxtPTZt9wDczvVHiSQSBnE9wIAHI8rK3m+52rBnk+YbZ2 HyXEponUikGhEBxpmsK8c4+TYIhLDChyf+UiOW6JQChq1uK9UpCrBbGVshgzpI+OzlCSiQl76Ge Wc+2jBfEykxR6FaZTYhdaAt+PHQSYkpGMfeuHkHmxSA8flWA86/t3q0Dzq+gjVkl5qj50IpTlJ8 Y286VC7GCmIdAeNFqRbc1Gjg+hbbT+siYwSI766ohebSBY+KtzA== X-Received: by 2002:a05:6102:dca:b0:5f7:24e9:6e91 with SMTP id ada2fe7eead31-5feb30faaebmr4985325137.36.1771862974238; Mon, 23 Feb 2026 08:09:34 -0800 (PST) X-Received: by 2002:a05:6102:dca:b0:5f7:24e9:6e91 with SMTP id ada2fe7eead31-5feb30faaebmr4985314137.36.1771862973768; Mon, 23 Feb 2026 08:09:33 -0800 (PST) Received: from t14s.vakwerkhuis.com ([78.108.130.194]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b9084c60b91sm338284066b.14.2026.02.23.08.09.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Feb 2026 08:09:33 -0800 (PST) From: Hans de Goede To: libcamera-devel@lists.libcamera.org Cc: Milan Zamazal , Hans de Goede Subject: [PATCH v2 1/4] software_isp: swstats_cpu: Prepare for multi-threading support Date: Mon, 23 Feb 2026 17:09:27 +0100 Message-ID: <20260223160930.27913-2-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260223160930.27913-1-johannes.goede@oss.qualcomm.com> References: <20260223160930.27913-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-GUID: MM-xm84Y-0IxP98ELwm4l6TJ7sAkBWYR X-Proofpoint-ORIG-GUID: MM-xm84Y-0IxP98ELwm4l6TJ7sAkBWYR X-Authority-Analysis: v=2.4 cv=CbsFJbrl c=1 sm=1 tr=0 ts=699c7bbf cx=c_pps a=N1BjEkVkxJi3uNfLdpvX3g==:117 a=rrvG0T/C2D967D07Ol03YQ==:17 a=HzLeVaNsDn8A:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=ZpdpYltYx_vBUK5n70dp:22 a=EUspDBNiAAAA:8 a=VvikW9XIONpR7lsxkDIA:9 a=crWF4MFLhNY0qMRaF8an:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMjIzMDEzOSBTYWx0ZWRfX647zS9HdaeHr GejI4lJZIGpr3hqx+0CwoPR/Sgq+PknAIn/3TzY2diPip0ReGnTwQJpIlsXvSQScqKzQKQkiVUB IcVr8vNKnlGImDFBGzeIAJKZrR2UG20mnlkzymA0y0f5eVB+NIcwMHFAd8c5OfTM+csEewFZb2m VjzrRL8Nct1FV7pM+cavmfwXyKxuxgqWY8UEmzsddeQvxoFMZiURQfCtXDuDGDrJ4PnzMqEw6uZ XJZjgrC1RzNcr6gNJUWp8vTrv6UtZ6JP1XXPh76/V6RdjEH2nxnva7i+CHAe9Gl89RUrt7s1+Zx yOhKlEZuKS7eaCbLZwdmUhReNZaDiKOxOFwAhJChSuboNIuvJC0ReS49ZwRgDxuOf0Ujnocyojf +yungaeu9oL1Xibw5kjt/U+FYFdNkFAw4ujnWyDc6ujdWDHXl1KNcBzBRSnObxnrHGwnJ1iaTpt zOBhosGP5GjPnKiwE5g== 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-23_03,2026-02-23_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 adultscore=0 impostorscore=0 priorityscore=1501 suspectscore=0 phishscore=0 spamscore=0 malwarescore=0 clxscore=1015 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2602230139 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 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 64b3e23f5..feee92f99 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 1cedcfbc1..7c71aed96 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 (unsigned int i = 0; i < stats_.size(); i++) { + stats_[i].sum_ = RGB({ 0, 0, 0 }); + stats_[i].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 (unsigned int i = 0; i < stats_.size(); i++) { + sharedStats_->sum_ += stats_[i].sum_; + for (unsigned int j = 0; j < SwIspStats::kYHistogramSize; j++) + sharedStats_->yHistogram[j] += stats_[i].yHistogram[j]; + } + } + + 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; } }