From patchwork Mon Sep 5 12:20:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 37674 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2590686pzh; Mon, 5 Sep 2022 05:20:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR7bwHauMgE776mabPhpdkD4zCBorn7WKQJomJCIPazSbzYUmFihUx07Tq50giLTpaNtj6r0 X-Received: by 2002:a17:907:2ce7:b0:741:4973:3fc9 with SMTP id hz7-20020a1709072ce700b0074149733fc9mr29512269ejc.678.1662380433833; Mon, 05 Sep 2022 05:20:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662380433; cv=none; d=google.com; s=arc-20160816; b=AzObZqxE4A6PntHZD+HA63lkujqXbUnORLTzXThcAK5J5GHwTtejux+wD2p1zN9Lop dkIm9/dfjHsL7KAwKPWU/oO5APChNjjgjY7yjbCQ0mWUeKbNCwU1ZynhycrltakvpP3k e38WOXhW6FyZLUzF/5BeJnx7Z6KpSZXdvC7ac3F0c1k3RCpFGGb0++ka6iz+MVvjQwoo +Je+WjyAWCyJFAxLzEDy60IYxTaAYU9lJslR9VMN7o7W1Ij/d0FRMSDdD28MFMnYR/qo B5WCsrWvTnv4JCsuIUfZEkUMO93XcfQHbws5VT0ok4m39w/Uq6xA89J3d/fmMiSmAfyh JowQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=V/JWxKKaj4ZVmHoA1cM/duQlJb5oghiTLV69O8V/fdA=; b=B+RX3PJ/lKuVa6pxEq8Y9SRMqNzW7Nvyye26tiFkAaNJ4fBHHQHpPe5luS0K/iSAj7 JHy36Old5DQHAMACgozxtRvRXQ3ibCNdi1/wZnqrwOA8HHTDIWIzv9vLloIpY1Vo9UKK DI1DLV5A8qGiXC+iuCIgvjhaZzNoCEmq4ia35MupjZSWkbx3TtG76pj7WZPbxfX5r96a IYwFF0p1iT97YOfNU1m15Bsz3FPgdc9KJGzVWIGUs0FbyriR9ygonrBl2y0YiOrlDD34 dsMbigG392JeitluE3rEeGcxV742+aL/80SkAcydg9EQlSWwKxH33dyr3WXIj7QLcmeS 5q1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=qwv6kzon; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j22-20020a1709064b5600b0073317fc9d6fsi6176955ejv.917.2022.09.05.05.20.32; Mon, 05 Sep 2022 05:20:33 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b=qwv6kzon; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19D8F68B823; Mon, 5 Sep 2022 15:20:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAAD168B179 for ; Mon, 5 Sep 2022 15:20:21 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id k22so9079410ljg.2 for ; Mon, 05 Sep 2022 05:20:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=DjriMuMmhV720z+on7PXPEJLRzy/Yh+WnAj8bcEvQNE=; b=qwv6kzonlH8gKTTyF/dHwHSOoeKHu++iI+7jorb6I1gg2hC+18DJYOXAjwdKTEKaRL Orbts7GQkwKJ2sVbCkWfdRHziPRwIIbuRsTkbP7Ziq8ZH02gsa95RUusnC5DwZtQ8m9l OtwkwRzZkAG+01TRFjs2t2EnA/SPl21KUTWqtZw+E7KPSRRjTwTGJ8hZuN+30CvmKMcX pogCymp47O/NkYZ6Kv/CitXVcukYD7fMJR3Zcpu+8By4bHk9tOKWp9MEPzb2QsknIAE5 z8eyLpVLTqfBQ+DmHYyI/9KkYx5tF20P1tSA2KF4SmObvtMnv9uuxEaBooiLNTSjRIeN 7owA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=DjriMuMmhV720z+on7PXPEJLRzy/Yh+WnAj8bcEvQNE=; b=ijfhA22B86taD3vMRZ5OfJBcLKpwZuluOAXipOOLBWc3Lw8DA36sN2plExxBNhxXhF P/Q2kuzvQFWZJclpgrxD8TRf627SWkwB3J90raVLOOO4zKDWpgHeRmLnpLl/qyqHtdPY sYNXUG6G1wHo3SX5wrml0Mm6PVh0p4y7x4jmUVdhDBCNV6oOqYWhZSCjdCITaC2NkRQU B03E1yo1hmarr4JsfDaZYg5MKg4lfyKs458zUlpsdjIEuCKN2w4s9cZq9aFlld10zIVY umam1G2aaq9m4R4cUQuAt8BfVu4BU8Q+++XSC3S3sk+l2RFKsahCzo6HaUXfprt0M/UY m/Tg== X-Gm-Message-State: ACgBeo3ExcOhnbPcmmIYJANL36a6+xNJAuJftH+oJY5klFNv0L68z3Fu 1YIpvmbklzSnhbHC74kAu9s5AUPWj4m1K+jk X-Received: by 2002:a2e:bc1e:0:b0:261:cee3:e35a with SMTP id b30-20020a2ebc1e000000b00261cee3e35amr15647584ljf.249.1662380421036; Mon, 05 Sep 2022 05:20:21 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id d8-20020ac244c8000000b00492f37e428asm1172094lfm.172.2022.09.05.05.20.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 05:20:20 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Sep 2022 15:20:20 +0300 Message-Id: <20220905122020.4103129-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] slicethread: Limit the automatic number of threads to 16 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ItsHlsgCySCE This matches a similar cap on the number of automatic threads in libavcodec/pthread_slice.c. On systems with lots of cores, this does speed things up in general (measurable on the level of the runtime of running "make fate"), and fixes a couple fate failures in 32 bit mode on such machines (where spawning a huge number of threads runs out of address space). --- libavutil/slicethread.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavutil/slicethread.c b/libavutil/slicethread.c index ea1c9c8311..115b099736 100644 --- a/libavutil/slicethread.c +++ b/libavutil/slicethread.c @@ -24,6 +24,8 @@ #include "thread.h" #include "avassert.h" +#define MAX_AUTO_THREADS 16 + #if HAVE_PTHREADS || HAVE_W32THREADS || HAVE_OS2THREADS typedef struct WorkerContext { @@ -105,7 +107,7 @@ int avpriv_slicethread_create(AVSliceThread **pctx, void *priv, if (!nb_threads) { int nb_cpus = av_cpu_count(); if (nb_cpus > 1) - nb_threads = nb_cpus + 1; + nb_threads = FFMIN(nb_cpus + 1, MAX_AUTO_THREADS); else nb_threads = 1; }