From patchwork Wed Mar 4 07:50:48 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: 26249 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 A8CF3C32EA for ; Wed, 4 Mar 2026 07:51:01 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BD64F62393; Wed, 4 Mar 2026 08:51:00 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="eThPLdMH"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gDL7Ip0/"; 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 BD59F62385 for ; Wed, 4 Mar 2026 08:50:58 +0100 (CET) Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6245SQc8945115 for ; Wed, 4 Mar 2026 07:50:57 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=Q9h8k+AeUz8 t+HWwjwjc7na33VwWe6woYgARNnc/Hyc=; b=eThPLdMHVr6ANYs7SKK8ctRTPRQ b0RJwit4F08qbh/7W86/Evqkt9C6l08019JBwUOIrdfVcJZn64MIVF/voNjkFdrR XmW4VE8eGmg0Y8ckhd/Qup2rKtvq5WFSv2ALhwVmE+Bp9hM+Z+P6vC0E7pIKTYLE bS9TGk65/KG3OmvbsDc4F2iTua7b8wRIv6Id+bnCESr06AD+krfni6JMJfXASKbO kJy9mwr4m3O2qa1PfMG8keYQyliEr57HqpKqP2ZAC9UZsEBxksQ1iEBbb1IZQTtI hcweV6LptiWM+3Mf4uP5hWN8xie8h9TT8mWJ8PaD0gzEkfDMV9WJfkdnoGA== Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cnvxfc48y-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 04 Mar 2026 07:50:57 +0000 (GMT) Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-8c70ed6c849so915904385a.1 for ; Tue, 03 Mar 2026 23:50:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1772610656; x=1773215456; 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=Q9h8k+AeUz8t+HWwjwjc7na33VwWe6woYgARNnc/Hyc=; b=gDL7Ip0/vtS3lnBXrBYPT5kUi1vm1QL44a1WOCurmQOtZO29CFfkCzmkABGOtWWvtf c0uxVNqKrwrzOOTZQA5ZcWU/KTjy7NK9y9tT19bJLmjTyu+SzX+4oPCmISUHSDoP7xCw WXt/YLnMquoDiOhpoyaTj1d1Ga4tpMnWVFskjrVQAB9QrZQ+wiUKCFXyTv7mPC92+1+P wg3GMXXqxSPfsA+SHq7ON9IaGTltbmxMLBc8B3Y7erHfI9dcbInhxml2O+DxgSBnMXTo XE/zJuwv1Hv+ZUh+wqRsynTXP1LROhlMW3/erNzOm+Rr4Jt7UFOFdsmJ1p5e8LihhhfM NiAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772610656; x=1773215456; 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=Q9h8k+AeUz8t+HWwjwjc7na33VwWe6woYgARNnc/Hyc=; b=vphXNA2ze8tGGVpnF6jxXIJ0b6/To6Y3Py5TJetYrbIDWFsrdWg7q5tflTo1t0hKOR m1vUHqY+H8sgt8fj25G8/e789ZsHimPAt0KhtY6TsLEseK69YU8AdoLFSygxlzwsPaY1 gO7+WOC1YfAaZuQt5Z9FDyYguRE6bJkjFbIH2ZwSDMjtxEfKL7ZAFwbiMri+qBuH7y3Y eUd6MUj7oHswfR83cBSDTt9Ip6LgaDsxHUU9q8rFCXjYiPCe4sGAD9yan1AbLAxJ4bXP taJu7s1SMoHG4yjfdQaZcAOUoGhU6KDUCW8GljwOooBqjaZy4fdq2URafWXZr00CiOVN XO2A== X-Gm-Message-State: AOJu0YwdIEmYU8MJY3a4ccma6IgpjDAJ5sdc6CkDafmVfVou3MNoPT0F OEjweThrnCdNSUJor5FHs09zmExE4/esqZODM6fqXJBMJS4zDWzZfk+Hh3C+YzmTqssoWYgjMhT tRMcP3p40pPp8sAgnMyu+yirBoARF0/wLopMm7sqq8X3pF8suoqFDQiRKCL/nmFj4LTM6+U6tUT DCaNeW+grx X-Gm-Gg: ATEYQzyqEnP88l4seFOBe8c9XVLZJdQZiMpU5viXZ6oMfiQpFA2VZZDpClxz3Yb+WCi L8OQdJf9z+T4HR5/r91oleaSRHhhDjwG91gTr98+Pu0RAS3xuzIzY4vMCnk9Da9GUW0XKWj+WCn mLcP6DwsDU3hWIPXKWCFPEONiihA5uogYibnJ1hEEYD/eN7t1zlZoIFPDP+6tX4i2HCbAnL4mYL KElpFc+7BdDi1oJZEs3gyGKXTk+d5xzKCS5z2Y5MZjNL4A2kBTtNha+JcGDvNfqmkHDE7lC/U6r NA79/7HPO+71IuAxyGU2/iScGJh4HxCHiIwnuQ6AfgAAUpk1JRhhIMG0MU6VNOuBFeHaGySwIM4 V+khj29xljfBUb0W3kYTCVR0zWKSLSJ5qKyCje1aPZnLvP6zPL53kQ9KCAzLWcdFMch4iyFySG9 iyA3gpBB0Lc2OLnGUDgcndwGeEUoNTpr6pnrGp X-Received: by 2002:a05:620a:4092:b0:8ca:2cf9:819c with SMTP id af79cd13be357-8cd5af8030fmr134516485a.40.1772610656283; Tue, 03 Mar 2026 23:50:56 -0800 (PST) X-Received: by 2002:a05:620a:4092:b0:8ca:2cf9:819c with SMTP id af79cd13be357-8cd5af8030fmr134514385a.40.1772610655575; Tue, 03 Mar 2026 23:50:55 -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-b935ac73a5dsm693263366b.25.2026.03.03.23.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2026 23:50:54 -0800 (PST) From: Hans de Goede To: libcamera-devel@lists.libcamera.org, Milan Zamazal Cc: Hans de Goede Subject: [PATCH v5 1/5] software_isp: swstats_cpu: Prepare for multi-threading support Date: Wed, 4 Mar 2026 08:50:48 +0100 Message-ID: <20260304075052.11599-2-johannes.goede@oss.qualcomm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260304075052.11599-1-johannes.goede@oss.qualcomm.com> References: <20260304075052.11599-1-johannes.goede@oss.qualcomm.com> MIME-Version: 1.0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzA0MDA2MiBTYWx0ZWRfX/g1av0/Ai38r bUP9Rd2RuKxNbGZ6M2wHV7d9OAAT5102kpT1fzy0RbdCL114AyDMUCQ0V1IOAt8yLbyvCx+3Vk8 YmP7piFhiM8VlqY6wIbRZ6zTKCyEWgJHGq6zSsD3JfqXLEx0FwGyQ09F60N7w7eSCBCgNxva719 GLnO+4+1OPjSdD7nXtKts9jGKVUYVc8K3/BkcrHQI7LbqJNJMSP4xJ4uFsrXyMPUI5DDMuIvevD lRWs8/2KNA7tof1c0jhRMp3UC8K33nBhOvYPNw9NeNdDwH1v/dUkGmWPp9sp9c1Zj1iSgvzaYuO O/43bpIaU0FflQAbpGVUA5cc6/giE6ik1PmxgbwWZFjcZ2kJtoALhjApKa25ph+ooFxKCQKUGV0 g7wrOdrcSHj92LPcNo+uOjxTnAEkcc6ycCQqhTaXHwB4/+hvaLQu6u6ntLGxOzCzu5tXEYh7elG fClaGU5b7d5/idSTVlA== X-Proofpoint-ORIG-GUID: L-_8Ch2F4ohKYdUAwgPDm6pbuTzh7Gkb X-Authority-Analysis: v=2.4 cv=S+HUAYsP c=1 sm=1 tr=0 ts=69a7e461 cx=c_pps a=50t2pK5VMbmlHzFWWp8p/g==:117 a=xqWC_Br6kY4A:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=20KFwNOVAAAA:8 a=EUspDBNiAAAA:8 a=VvikW9XIONpR7lsxkDIA:9 a=IoWCM6iH3mJn3m4BftBB:22 X-Proofpoint-GUID: L-_8Ch2F4ohKYdUAwgPDm6pbuTzh7Gkb 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-03-04_02,2026-03-03_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 clxscore=1015 spamscore=0 priorityscore=1501 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2602130000 definitions=main-2603040062 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. Reviewed-by: Milan Zamazal Signed-off-by: Hans de Goede --- Changes in v4: - Use const in for (const auto &s : stats_) {} in SwStatsCpu::finishFrame() - Add Milan's Reviewed-by 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 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..ded0dcf1a 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 (const auto &s : stats_) { + sharedStats_->sum_ += s.sum_; + for (unsigned int j = 0; j < SwIspStats::kYHistogramSize; j++) + sharedStats_->yHistogram[j] += s.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; } }