From patchwork Sun Mar 12 20:08:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13171797 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 611B1C6FA99 for ; Sun, 12 Mar 2023 20:09:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230465AbjCLUJ3 (ORCPT ); Sun, 12 Mar 2023 16:09:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230523AbjCLUJ1 (ORCPT ); Sun, 12 Mar 2023 16:09:27 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E364F76B5 for ; Sun, 12 Mar 2023 13:09:06 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id a4-20020a056830008400b0069432af1380so5682958oto.13 for ; Sun, 12 Mar 2023 13:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678651739; 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=iyqYOaxxImvzJ2bqTTROPStQr1pAZDd9ApQJRZXamwM=; b=Tv8HidT0l5xqP/C7f6dzllhmxKJj1SYpLlLXajlYZ99L01Mg6pKAh5CSdJPCkr13xl yaHotCuD2vQycxSyy8wTe6T5qJLlznhglcKCXOVOB3LivT2tX6arOr0TGsdD+kACWG46 X836G6APkGj/4+um1baqATi0PgjQrtJLoSA+H6DEAYiEXJLTeuwceBxsO9UMh7HK9+nO u4Q7bjPbUfX7zFwRo3KBAnvm8bnUuN+Bkh+ZzJ4+TjJsmQhG/4SkLFHb1ygvUhpy77gR a3wgrPPeAK3zfph3z51QhfgymyMv6znXDaNadmD9ToGDsoHJnywjfBTw1blgy8r+B9C4 +S7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678651739; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iyqYOaxxImvzJ2bqTTROPStQr1pAZDd9ApQJRZXamwM=; b=pDVw+HgPvde2l1aRX9IdqPBDZLjnIw0dI89UVLQHMocg6lCVSn0gav5JEGeZHkSXwI VPgqdX3dqJ1/eJRaBLCfV9K2wikjROBUPv6M2zUyruEvSjmlWFUOtoyRD49bHYZQd0Fx farImid5fmTtp1CX65uS89saqnqe2fHPcXqVHySFkjr1+ENuVAL6FwO66YrnZsVRlrU0 Kf+e7oaf4fO9RN2NZgn7ugi2QksCA6mVm1fZ1EPfltyHvRscWnQioz+NmXq/sFnS6aFQ IpBgtk0pzPKegm9EnTzdg8Xj504OEM+THmeHk9CUDzROtUqsAVX3JA6T1c63eicjliRJ egLQ== X-Gm-Message-State: AO0yUKWzDbsPRLic95u6mY4G92gtNAkW0lwUoXFPQYQEDGxKVOJgT0gh 9FVJ1TLClXlEU0O1zb7hM/Yk9GCSqy0= X-Google-Smtp-Source: AK7set/ksSz9bj16Prjjoja15CRrEeVxFgaXLWwnKsaj5zjS3qqfong7wtweX8RQpoJTzYFtc6iLUQ== X-Received: by 2002:a05:6830:2338:b0:693:c3bb:8392 with SMTP id q24-20020a056830233800b00693c3bb8392mr4338925otg.7.1678651738917; Sun, 12 Mar 2023 13:08:58 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id o16-20020a9d4110000000b0068664355604sm2450585ote.22.2023.03.12.13.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 13:08:58 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras , Shaoxuan Yuan Subject: [PATCH 1/5] perf: sparse: remove grep --sparse option Date: Sun, 12 Mar 2023 14:08:52 -0600 Message-Id: <20230312200856.323688-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.39.2.13.g1fb56cf030 In-Reply-To: <20230312200856.323688-1-felipe.contreras@gmail.com> References: <20230312200856.323688-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It was never added. Cc: Shaoxuan Yuan Signed-off-by: Felipe Contreras --- t/perf/p2000-sparse-operations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh index 3242cfe91a..e4a132f593 100755 --- a/t/perf/p2000-sparse-operations.sh +++ b/t/perf/p2000-sparse-operations.sh @@ -124,6 +124,6 @@ test_perf_on_all git read-tree -mu HEAD test_perf_on_all git checkout-index -f --all test_perf_on_all git update-index --add --remove $SPARSE_CONE/a test_perf_on_all "git rm -f $SPARSE_CONE/a && git checkout HEAD -- $SPARSE_CONE/a" -test_perf_on_all git grep --cached --sparse bogus -- "f2/f1/f1/*" +test_perf_on_all git grep --cached bogus -- "f2/f1/f1/*" test_done From patchwork Sun Mar 12 20:08:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13171798 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8B6BFC6FA99 for ; Sun, 12 Mar 2023 20:09:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230274AbjCLUJa (ORCPT ); Sun, 12 Mar 2023 16:09:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231124AbjCLUJ1 (ORCPT ); Sun, 12 Mar 2023 16:09:27 -0400 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6BFBBB766 for ; Sun, 12 Mar 2023 13:09:07 -0700 (PDT) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-17786581fe1so4472065fac.10 for ; Sun, 12 Mar 2023 13:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678651740; 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=2Y3mmcLrjJlhO1Q8g5wJPOGcGtUh0BkXk09fcnrGsmw=; b=oboRg1l+rD57mAZBRYZlZqSxKY6gBZOKbOa3s4qHkHG3jSS2hS3W6PwW2RclVGRirJ WXF70IREFBy8oSGE6e1G1+z7URL6d9I+8MmtmP6X8JCQlbceR6hN3TqzKuGEKw/fC7cz 0l2pXzH9nhoYDZRn2ZO63oRhIzTrOeMVFwf+DpFtXvr3lWlq4x0r4iIZE34xuhYvPuWP hbUgERCKPYHEAAFo/GAaMVzG8aAeM8gTA/jrR5USOVWEV8mFX/U142PsyaBFMploivMO CArGhleWn/4xuj2p2Uey+LaM9sMdIK1pWaTRFObwGAWslZy/pIHWMKzY8tu/rFrLms2G 78Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678651740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2Y3mmcLrjJlhO1Q8g5wJPOGcGtUh0BkXk09fcnrGsmw=; b=2JdwUpFyuljc2TjuawTVDFqCgB+dl3hXF0LgKVcqB8nIwtMZzzBnIVPu5HIuXyW2A7 pnuzs6B6JG6/pVTPSeh1Lot4EhWuu02dALySLIUmQTO/akX+oPdjELAMTjlgUPwLhVBC Ns4DBlMC5v50U8Csmzt/y2QAVGE6vSXWSi5ssqneGe/zirYgXAXQ87+46P7rZ4hgxnRj BF7Cp+qHeKIHLfprJJ2Lx70GExLNS45QS+1bH3MbQgUnQx3iwkVPVa9ug0/5RLHxBUkG b064dRkpV9ohPG1lwGZ3um5kvkKip9TKaV5bI6P0W6zpRrYlZTGGc5iQOaefPEvJNkDM K40Q== X-Gm-Message-State: AO0yUKXbAZUo3k8Zi9CHxNRexBV9JKkCToj8qoALaT8dWogrmDPI0qKj ttde3sLZ383HnfleqKL78I4XYLuvI5I= X-Google-Smtp-Source: AK7set/fuuZJA8Kc1vKO4NH7HnHU1RNrFWIsYIV0raRjPFeUVMHAhSF/kgk2LoDy8zmoGnu4Y/WQfA== X-Received: by 2002:a05:6870:45a0:b0:177:a308:8bc6 with SMTP id y32-20020a05687045a000b00177a3088bc6mr1776406oao.18.1678651740198; Sun, 12 Mar 2023 13:09:00 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id ef49-20020a0568701ab100b001724742cfcesm2320428oab.38.2023.03.12.13.08.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 13:08:59 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras , Neeraj Singh Subject: [PATCH 2/5] perf: grep: fix prereqs Date: Sun, 12 Mar 2023 14:08:53 -0600 Message-Id: <20230312200856.323688-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.39.2.13.g1fb56cf030 In-Reply-To: <20230312200856.323688-1-felipe.contreras@gmail.com> References: <20230312200856.323688-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since 5dccd9155f (t/perf: add iteration setup mechanism to perf-lib, 2022-04-04) they are in a --prereq option. Cc: Neeraj Singh Cc: Ævar Arnfjörð Bjarmason Signed-off-by: Felipe Contreras --- t/perf/p7821-grep-engines-fixed.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/perf/p7821-grep-engines-fixed.sh b/t/perf/p7821-grep-engines-fixed.sh index 61e41b82cf..0d75240dae 100755 --- a/t/perf/p7821-grep-engines-fixed.sh +++ b/t/perf/p7821-grep-engines-fixed.sh @@ -33,13 +33,13 @@ do fi if ! test_have_prereq PERF_GREP_ENGINES_THREADS then - test_perf $prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" " + test_perf "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" --prereq "$prereq" " git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || : " else for threads in $GIT_PERF_GREP_THREADS do - test_perf PTHREADS,$prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern with $threads threads" " + test_perf "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern with $threads threads" --prereq "$prereq" " git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine.$threads' || : " done From patchwork Sun Mar 12 20:08:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13171799 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BA94C6FD19 for ; Sun, 12 Mar 2023 20:09:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231143AbjCLUJe (ORCPT ); Sun, 12 Mar 2023 16:09:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230503AbjCLUJa (ORCPT ); Sun, 12 Mar 2023 16:09:30 -0400 Received: from mail-oi1-x229.google.com (mail-oi1-x229.google.com [IPv6:2607:f8b0:4864:20::229]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9304324128 for ; Sun, 12 Mar 2023 13:09:10 -0700 (PDT) Received: by mail-oi1-x229.google.com with SMTP id bk32so8061874oib.10 for ; Sun, 12 Mar 2023 13:09:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678651741; 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=bebF08/+RDv/uLWtfqv73JX0ux1QIUq3jA8prI7QtMw=; b=ABzagcSnK7OAKrSldoC+LP1TZaiK/XfH35arrjdG5EFwzFXuqBRUJ/q6Sux/NbEZ62 sYfWMdBHRDJqbCdSwX3D9snxe4Mc7o9T7sNnTdzprQw/t9WT0nmGOgRYFDKmaabTyr3K Sg3lGZSrP4L5qkO+gQivXgwA5NRv2kaSAyXCyQDySyjEacZR/cVGL5Izq0BPiUZKRsUs Zwl62BjhNIyVGilDvjpEyrskAaDpJVfeYrginhOdPQqxM1QSTJ0KlVquFS+WyAr089h4 JzKV7fUpcPHs0kItQ5NDfrzlJikTGJlPLdAYU1wf0sje0GIMdEEnJx1xt7SET4tXhsBM KtHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678651741; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bebF08/+RDv/uLWtfqv73JX0ux1QIUq3jA8prI7QtMw=; b=Drzk+K4bvwYCy7ol1Sz/vIm0qfH8DxB6CbQ+RAlZjzD5uuDFrXlDy2qJiNOlnQDaIo B+UapknspGocJYexl5i8mQSkKB5QC64GTLG+jr1nJAkswtVP6zMO9AZtym2P1cMg9t09 ttvQEos51xTt2XDahKsGg35nBCyxG7I/pheseg9ITkLCL/3GO31kB9zYRiIbWL+ziMNL ic6Eu1olHHfW1oLYtq2KWo/X8e7GUC0QWo/YKB0z+TQLZMa2ysANdIzNSyZIGj+Yq/cm JBmvAshav8VgcHUK8njdmiOUGNgCZBe4kk1DMqYSgomQm0BVlP/Z1YbPWDaSA1DdPTu4 rNNw== X-Gm-Message-State: AO0yUKUf2sq9nmhUdc8f7dse0irtbbbP18Yua7nH4SXXPXfTIr5bu23m TR8fFUgUw86C7trIn5WTuFtBHETOPFU= X-Google-Smtp-Source: AK7set+I3hHaObe57i5a9+t1/vL8tKo4QPbDlsI8n5vO7TK2Q5XXoEZPjhBiU06qUSUGidz2VPwtNQ== X-Received: by 2002:a05:6808:298a:b0:384:1c31:d10e with SMTP id ex10-20020a056808298a00b003841c31d10emr13997435oib.41.1678651741520; Sun, 12 Mar 2023 13:09:01 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id q132-20020acac08a000000b00383b371f2a7sm2368081oif.42.2023.03.12.13.09.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 13:09:01 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH 3/5] perf: grep: don't check PRCE twice Date: Sun, 12 Mar 2023 14:08:54 -0600 Message-Id: <20230312200856.323688-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.39.2.13.g1fb56cf030 In-Reply-To: <20230312200856.323688-1-felipe.contreras@gmail.com> References: <20230312200856.323688-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Just set the prereq and let the testing framework check it once. Cc: Ævar Arnfjörð Bjarmason Signed-off-by: Felipe Contreras --- t/perf/p4220-log-grep-engines.sh | 2 +- t/perf/p4221-log-grep-engines-fixed.sh | 2 +- t/perf/p7820-grep-engines.sh | 2 +- t/perf/p7821-grep-engines-fixed.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/t/perf/p4220-log-grep-engines.sh b/t/perf/p4220-log-grep-engines.sh index 03fbfbb85d..2c619a626f 100755 --- a/t/perf/p4220-log-grep-engines.sh +++ b/t/perf/p4220-log-grep-engines.sh @@ -30,7 +30,7 @@ do # Poor man's basic -> extended converter. pattern=$(echo $pattern | sed 's/\\//g') fi - if test $engine = "perl" && ! test_have_prereq PCRE + if test $engine = "perl" then prereq="PCRE" else diff --git a/t/perf/p4221-log-grep-engines-fixed.sh b/t/perf/p4221-log-grep-engines-fixed.sh index 0a6d6dfc21..095c5d1765 100755 --- a/t/perf/p4221-log-grep-engines-fixed.sh +++ b/t/perf/p4221-log-grep-engines-fixed.sh @@ -20,7 +20,7 @@ for pattern in 'int' 'uncommon' 'æ' do for engine in fixed basic extended perl do - if test $engine = "perl" && ! test_have_prereq PCRE + if test $engine = "perl" then prereq="PCRE" else diff --git a/t/perf/p7820-grep-engines.sh b/t/perf/p7820-grep-engines.sh index 9bfb86842a..336424cb00 100755 --- a/t/perf/p7820-grep-engines.sh +++ b/t/perf/p7820-grep-engines.sh @@ -41,7 +41,7 @@ do # Poor man's basic -> extended converter. pattern=$(echo "$pattern" | sed 's/\\//g') fi - if test $engine = "perl" && ! test_have_prereq PCRE + if test $engine = "perl" then prereq="PCRE" else diff --git a/t/perf/p7821-grep-engines-fixed.sh b/t/perf/p7821-grep-engines-fixed.sh index 0d75240dae..79b1b9f8b2 100755 --- a/t/perf/p7821-grep-engines-fixed.sh +++ b/t/perf/p7821-grep-engines-fixed.sh @@ -25,7 +25,7 @@ for pattern in 'int' 'uncommon' 'æ' do for engine in fixed basic extended perl do - if test $engine = "perl" && ! test_have_prereq PCRE + if test $engine = "perl" then prereq="PCRE" else From patchwork Sun Mar 12 20:08:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13171801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85003C74A4B for ; Sun, 12 Mar 2023 20:09:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231130AbjCLUJk (ORCPT ); Sun, 12 Mar 2023 16:09:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230481AbjCLUJb (ORCPT ); Sun, 12 Mar 2023 16:09:31 -0400 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B0BD25975 for ; Sun, 12 Mar 2023 13:09:11 -0700 (PDT) Received: by mail-oi1-x22f.google.com with SMTP id e21so8106402oie.1 for ; Sun, 12 Mar 2023 13:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678651743; 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=uddwbV73cueW/OWJ+6VEnddoNYFBuFaamptQ2RSOxlo=; b=C7Vg7Fw/bAPBIp83KueO8XifgwDUPvWcy0T37sldQ7hUXVc7cOVWHuuNYc2s+X0F0O I0ooyS8BewVN/1+lTi1eLVohaX0dzLAccqe3YFUbA7+ZbHxydWHQil23dp9UfO/UCcNw 2wSsDk0fm/0kyT0NnC3yNdg2lP8sA71o+lK+vrH85nECkY7oyYkqdTOErYgu02gybLbg 4eSVp8Zle/qEx5Qk34uTgCgkGU15MZayS7LXJe/dW1vSOq0kduPGmv3OAnAD9Xr9h3ju fIeq5uWbdBVMJz8sYKBrGeyKS39BqVo+Wb6y9DH+puDexeAofaXaxe9ojAOUZponmqLj 9vfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678651743; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uddwbV73cueW/OWJ+6VEnddoNYFBuFaamptQ2RSOxlo=; b=Z5HWkJBI8R5Y6qlj20iM1r4qiM0T8tfjGdJ0TEbTG3aZxT3u8qc3kHRvxLQNQaEuT3 bfLnFRE7ZxFGyhRzR5dbAZ8s0GFESj6GxmVmDYFdDwBy10pZi4T9ZseIi0Lcctdp3it5 v4uhx6XwyFa3U5jQ3u5ClMfrYK2hwtmKwfANDxrYXmXU7DrYJXvCXELxy0G+SBI00zVH MCrBbvSWZJhELssHUgEf0ZcyLNQllS0v89MdEJnFPXMloR58nG4riBrXfyHE5KCWNvVr AAH4iYVRXvrWjwY8Hr0on3rS+boNeYwDMCND4Rfqhn8KgZ5YwkvJRqq6J6V+PxXsM9UQ 54lA== X-Gm-Message-State: AO0yUKUFFmE3VifGUzW5+BNPqMl+4ZqAl6jvOv9DOcX3QPTs36DPzkPM oaUA9RtwQhq+7mnRryAvlQ896UPBjlY= X-Google-Smtp-Source: AK7set9k9c98BTPvg6eX92M0G1aNoTIoMsew6sTbQP+7vZJ3NZMtsRre782gtKZkpETajLyuxtaJkg== X-Received: by 2002:a05:6808:d8:b0:384:2357:dccd with SMTP id t24-20020a05680800d800b003842357dccdmr13806110oic.40.1678651742711; Sun, 12 Mar 2023 13:09:02 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id k2-20020a056808068200b00383f0773beasm2356416oig.52.2023.03.12.13.09.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 13:09:02 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH 4/5] perf: grep: avoid unused prereq Date: Sun, 12 Mar 2023 14:08:55 -0600 Message-Id: <20230312200856.323688-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.39.2.13.g1fb56cf030 In-Reply-To: <20230312200856.323688-1-felipe.contreras@gmail.com> References: <20230312200856.323688-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There is no point in setting PERF_GREP_ENGINES_THREADS if we are going to check it ourselves. Cc: Ævar Arnfjörð Bjarmason Signed-off-by: Felipe Contreras --- t/perf/p7820-grep-engines.sh | 9 ++------- t/perf/p7821-grep-engines-fixed.sh | 9 ++------- t/perf/p7822-grep-perl-character.sh | 7 +------ 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/t/perf/p7820-grep-engines.sh b/t/perf/p7820-grep-engines.sh index 336424cb00..f80fdcb5e2 100755 --- a/t/perf/p7820-grep-engines.sh +++ b/t/perf/p7820-grep-engines.sh @@ -22,11 +22,6 @@ etc.) we will test the patterns under those numbers of threads. test_perf_large_repo test_checkout_worktree -if test -n "$GIT_PERF_GREP_THREADS" -then - test_set_prereq PERF_GREP_ENGINES_THREADS -fi - for pattern in \ 'how.to' \ '^how to' \ @@ -47,7 +42,7 @@ do else prereq="" fi - if ! test_have_prereq PERF_GREP_ENGINES_THREADS + if test -z "$GIT_PERF_GREP_THREADS" then test_perf "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" \ --prereq "$prereq" " @@ -64,7 +59,7 @@ do fi done - if ! test_have_prereq PERF_GREP_ENGINES_THREADS + if test -z "$GIT_PERF_GREP_THREADS" then test_expect_success "assert that all engines found the same for$GIT_PERF_7820_GREP_OPTS '$pattern'" ' test_cmp out.basic out.extended && diff --git a/t/perf/p7821-grep-engines-fixed.sh b/t/perf/p7821-grep-engines-fixed.sh index 79b1b9f8b2..f25b4976ea 100755 --- a/t/perf/p7821-grep-engines-fixed.sh +++ b/t/perf/p7821-grep-engines-fixed.sh @@ -16,11 +16,6 @@ etc.) we will test the patterns under those numbers of threads. test_perf_large_repo test_checkout_worktree -if test -n "$GIT_PERF_GREP_THREADS" -then - test_set_prereq PERF_GREP_ENGINES_THREADS -fi - for pattern in 'int' 'uncommon' 'æ' do for engine in fixed basic extended perl @@ -31,7 +26,7 @@ do else prereq="" fi - if ! test_have_prereq PERF_GREP_ENGINES_THREADS + if test -z "$GIT_PERF_GREP_THREADS" then test_perf "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" --prereq "$prereq" " git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || : @@ -46,7 +41,7 @@ do fi done - if ! test_have_prereq PERF_GREP_ENGINES_THREADS + if test -z "$GIT_PERF_GREP_THREADS" then test_expect_success "assert that all engines found the same for$GIT_PERF_7821_GREP_OPTS $pattern" ' test_cmp out.fixed out.basic && diff --git a/t/perf/p7822-grep-perl-character.sh b/t/perf/p7822-grep-perl-character.sh index 87009c60df..2b73d41e2b 100755 --- a/t/perf/p7822-grep-perl-character.sh +++ b/t/perf/p7822-grep-perl-character.sh @@ -11,11 +11,6 @@ etc.) we will test the patterns under those numbers of threads. test_perf_large_repo test_checkout_worktree -if test -n "$GIT_PERF_GREP_THREADS" -then - test_set_prereq PERF_GREP_ENGINES_THREADS -fi - for pattern in \ '\\bhow' \ '\\bÆvar' \ @@ -24,7 +19,7 @@ for pattern in \ '\\w{12}\\b' do echo '$pattern' >pat - if ! test_have_prereq PERF_GREP_ENGINES_THREADS + if test -z "$GIT_PERF_GREP_THREADS" then test_perf "grep -P '$pattern'" --prereq PCRE " git -P grep -f pat || : From patchwork Sun Mar 12 20:08:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 13171800 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E40AC6FA99 for ; Sun, 12 Mar 2023 20:09:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231169AbjCLUJi (ORCPT ); Sun, 12 Mar 2023 16:09:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230462AbjCLUJb (ORCPT ); Sun, 12 Mar 2023 16:09:31 -0400 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D148113DF for ; Sun, 12 Mar 2023 13:09:12 -0700 (PDT) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1767a208b30so11816273fac.2 for ; Sun, 12 Mar 2023 13:09:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678651744; 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=VvKGP31BprEkJEt7iCJBC5GonowfTndZxQvVwml8PBE=; b=FlZcLKmAt5740RkrzGaZk0ivFeUpgN+VER6egfWWlC/GJ//U/24gEr1YcD9KJIMfG4 I2g+i8lZvqGb3u52YIxBwB59THviMbq5X0Du53+OSPtZf1ib5UimnEpReOGfl22nIqTf upTkqaOzW3OzZ8lW2y87MSE4AxNogXmTdLKvf7m3hXjZAQnMSauXwVjzO9QrhFsNN4XM mSplRdx0gqaxvV5fPL4Dw0BsofElSqTbvj35+szHfBv1eN6BSeugkoAt+F/8ZLouhxXI SQiJo4AcvpfbtpvXDSJKhgzMuvMQ/Xspr3ltL43dqrQcv8rM8Y0VcGBMUWkEX+QqmavO cJ/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678651744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VvKGP31BprEkJEt7iCJBC5GonowfTndZxQvVwml8PBE=; b=gSuEYwnmAy++lNGg4hsrdskYfG1K25TxrnYKDepEOgo/o93fEOQSvaRDaiVoFHtdqa Mqx5U683LmWJCDpTn9d+ZhDmEE5EJmoRARPsY7w9SA+qM8mKhlUzOybCaFbRejEKkt/W RVuuS3hpBWnoFmkx7YfD2GTYYuokNuRDcZZrzH+ui6WrWnaCTiOdVVv9f5n/WFzZuMAw ZwNo1P/GT4cWg9svRTl6FfvgtdNb1BXeNNTXirhxVLWpRcOQsaWB1rmZfAT68IfYzGUp 3GMUvxK7vOwbf8gzPuYCw5A+G0h487CCmAMqER73T1tfossprVYZ+tSqp/PuzUZ2mX/H alZQ== X-Gm-Message-State: AO0yUKX1P7/wxaaWc4L6MEpnOSH1lsuKYIIofFRx7Q6gjnj97egZIvLM 1CxEBvbqpVkKVZdxI9oyVSZkHPCWAIU= X-Google-Smtp-Source: AK7set/g3KE0kzcf9D4XTn3f1QOlj5KmDk/Grh8rvgjzYYhD/ipGOHyTmEOxyt4cRHnhd8OCXtRqZA== X-Received: by 2002:a05:6870:ac06:b0:177:9c2f:cfd0 with SMTP id kw6-20020a056870ac0600b001779c2fcfd0mr2936955oab.44.1678651743948; Sun, 12 Mar 2023 13:09:03 -0700 (PDT) Received: from localhost ([2806:2f0:4060:fff1:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id ax16-20020a05687c021000b00176d49bb898sm2329391oac.44.2023.03.12.13.09.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Mar 2023 13:09:03 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras , Christian Couder Subject: [PATCH 5/5] perf: aggregate: check if subtest exists Date: Sun, 12 Mar 2023 14:08:56 -0600 Message-Id: <20230312200856.323688-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.39.2.13.g1fb56cf030 In-Reply-To: <20230312200856.323688-1-felipe.contreras@gmail.com> References: <20230312200856.323688-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org If no tests were run, for example in p7822-grep-perl-character.sh, that's not a fatal error, just skip to the next one. Cc: Christian Couder Signed-off-by: Felipe Contreras --- t/perf/aggregate.perl | 1 + 1 file changed, 1 insertion(+) diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl index 575d2000cc..a79451a0af 100755 --- a/t/perf/aggregate.perl +++ b/t/perf/aggregate.perl @@ -156,6 +156,7 @@ sub sane_backticks { $t =~ s{(?:.*/)?(p(\d+)-[^/]+)\.sh$}{$1} or die "bad test name: $t"; my $n = $2; my $fname = "$resultsdir/$t.subtests"; + next unless (-e $fname); open my $fp, "<", $fname or die "cannot open $fname: $!"; for (<$fp>) { chomp;