From patchwork Fri Jul 7 10:42:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42498 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1e:b0:12b:9ae3:586d with SMTP id c30csp7188789pzh; Fri, 7 Jul 2023 03:43:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlHiNX3ky0f4tUeFbzUaHYZQX7MAWePreDpDRcv+lXJl5kxCsiEdqtD9D1yKYVok57hPAb5E X-Received: by 2002:a17:906:1046:b0:993:d5bd:a75e with SMTP id j6-20020a170906104600b00993d5bda75emr863693ejj.6.1688726609360; Fri, 07 Jul 2023 03:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688726609; cv=none; d=google.com; s=arc-20160816; b=PZMV1raJIPFVmSwWWhMolp0zN1uIlrYA3OXzTPbGpq04LOzX9uYJ1JAaXzEITVBj7g 4XqLjGP/u0FirPhh5zWw9ipq5z6B2uWBZDqeysm7q0ja3CIx53luZyE6o9sYxtTBaXhB 9fdDw3mVRx41oh2aQkO82bJnhfSIx6oz1pN0IMvphrV2a2fk4VDRLR2BT/hhb+VHqacI c+M10NTNxALdJllrXo4bJAZrpzItKbS5hRkRQ/n6/P9luSHVpyX7Who7wYnRcSBwGbWh 3bxxdcaWKCWJgyA+EgQkVBW0WxrD6cWPHAxBtXqN6fhs0hFudztVBLB33cwwckGELsd4 UmBg== 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:references:in-reply-to:message-id :date:to:from:delivered-to; bh=z7TcZKiwWKsHbbFwhvsbc1Cn5mWJzsVRUx4obWw1AZ0=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=I5my+Fkj3x4n07hJglzIvQ3jV2Ru+EKGLXHxXzcQj4mf3ae5ws2+D7iCPfNa3JQsTI tXBu3J3qi3btxw3xtNjFG5AtEI8pcGKcLz11KSk4+dGtdh/QaVmIh4p4JKXRQx81/TRs CYNenVKFZvTwo95NTc2TJJ2bOlg8u+P69lhf46B8l2Hf2fHUh88Fn2g45bPDvioTW9Kk mmbxrUJSlg9PiEm+jMyUXTTHdih9w8H758r2dE/AzKyoEOt5kZmAPefgXReleHNhxHPB MvbCxtNGdsHVq8DMT9GnMCXwg2Fg3sLCEjfjgGjRa1tDhSND3V2z6Qr7GLniCEnlAwsq c4cA== ARC-Authentication-Results: i=1; mx.google.com; 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 t5-20020a170906178500b00993afed2932si2091590eje.324.2023.07.07.03.43.28; Fri, 07 Jul 2023 03:43:29 -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; 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 B2AB868C70C; Fri, 7 Jul 2023 13:43:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EC1D68C70C for ; Fri, 7 Jul 2023 13:43:18 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 34A822404EC for ; Fri, 7 Jul 2023 12:43:18 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id SNn77n-MUSKX for ; Fri, 7 Jul 2023 12:43:17 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3C2912404EA for ; Fri, 7 Jul 2023 12:43:17 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E704E3A0153 for ; Fri, 7 Jul 2023 12:43:16 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jul 2023 12:42:52 +0200 Message-Id: <20230707104251.19707-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230623144147.7940-2-anton@khirnov.net> References: <20230623144147.7940-2-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tests/fate-run: add testing with a random number of threads 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: +40QVcNpUqTN Useful for discovering bugs that depend on a specific thread count. Use like THREADS=randomX for a random thread count from 1 to X, with X=16 when not specified. --- Now using the awk rand() function, also used in configure. The thread count can now be written into the errfile on test failure. --- doc/fate.texi | 8 ++++++++ tests/fate-run.sh | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/doc/fate.texi b/doc/fate.texi index 8450856015..2fa8c34c2d 100644 --- a/doc/fate.texi +++ b/doc/fate.texi @@ -223,6 +223,14 @@ meaning only while running the regression tests. Specify how many threads to use while running regression tests, it is quite useful to detect thread-related regressions. +This variable may be set to the string "random", optionally followed by a +number, like "random99", This will cause each test to use a random number of +threads. If a number is specified, it is used as a maximum number of threads, +otherwise 16 is the maximum. + +In case a test fails, the thread count used for it will be written into the +errfile. + @item THREAD_TYPE Specify which threading strategy test, either @samp{slice} or @samp{frame}, by default @samp{slice+frame} diff --git a/tests/fate-run.sh b/tests/fate-run.sh index e12279e4cf..5a71ac001e 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -33,6 +33,15 @@ errfile="${outdir}/${test}.err" cmpfile="${outdir}/${test}.diff" repfile="${outdir}/${test}.rep" +case $threads in + random*) + threads_max=${threads#random} + [ -z "$threads_max" ] && threads_max=16 + threads=$(awk "BEGIN { print 1+int(rand() * $threads_max) }" < /dev/null) + ;; +esac + + target_path(){ test ${1} = ${1#/} && p=${target_path}/ echo ${p}${1} @@ -630,6 +639,7 @@ fi if [ $err -eq 0 ] && test $report_type = "standard" ; then unset cmpo erro else + echo "threads=$threads" >> "$errfile" cmpo="$($base64 <$cmpfile)" erro="$($base64 <$errfile)" fi