From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Jeffrey Walton" <noloader@gmail.com>,
"Michał Kiedrowicz" <michal.kiedrowicz@gmail.com>,
"J Smith" <dark.panda@gmail.com>,
"Victor Leschuk" <vleschuk@gmail.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Fredrik Kuivinen" <frekui@gmail.com>,
"Brandon Williams" <bmwill@google.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v4 20/31] perf: add a comparison test of log --grep regex engines with -F
Date: Thu, 25 May 2017 19:45:24 +0000 [thread overview]
Message-ID: <20170525194535.9324-21-avarab@gmail.com> (raw)
In-Reply-To: <20170525194535.9324-1-avarab@gmail.com>
Add a performance comparison test of log --grepgrep regex engines
given fixed strings.
See the preceding fixed-string t/perf change ("perf: add a comparison
test of grep regex engines with -F", 2017-04-21) for notes about this,
in particular this mostly tests exactly the same codepath now, but
might not in the future:
$ GIT_PERF_REPEAT_COUNT=10 GIT_PERF_LARGE_REPO=~/g/linux ./run p4221-log-grep-engines-fixed.sh
[...]
Test this tree
--------------------------------------------------------
4221.1: fixed log --grep='int' 5.99(5.55+0.40)
4221.2: basic log --grep='int' 5.92(5.56+0.31)
4221.3: extended log --grep='int' 6.01(5.51+0.45)
4221.4: perl log --grep='int' 5.99(5.56+0.38)
4221.6: fixed log --grep='uncommon' 5.06(4.76+0.27)
4221.7: basic log --grep='uncommon' 5.02(4.78+0.21)
4221.8: extended log --grep='uncommon' 4.99(4.78+0.20)
4221.9: perl log --grep='uncommon' 5.00(4.72+0.26)
4221.11: fixed log --grep='æ' 5.35(5.12+0.20)
4221.12: basic log --grep='æ' 5.34(5.11+0.20)
4221.13: extended log --grep='æ' 5.39(5.10+0.22)
4221.14: perl log --grep='æ' 5.44(5.16+0.23)
Only the non-ASCII -i case is different:
$ GIT_PERF_REPEAT_COUNT=10 GIT_PERF_LARGE_REPO=~/g/linux GIT_PERF_4221_LOG_OPTS=' -i' ./run p4221-log-grep-engines-fixed.sh
[...]
Test this tree
-----------------------------------------------------------
4221.1: fixed log -i --grep='int' 6.17(5.77+0.35)
4221.2: basic log -i --grep='int' 6.16(5.59+0.39)
4221.3: extended log -i --grep='int' 6.15(5.70+0.39)
4221.4: perl log -i --grep='int' 6.15(5.69+0.38)
4221.6: fixed log -i --grep='uncommon' 5.10(4.88+0.21)
4221.7: basic log -i --grep='uncommon' 5.04(4.76+0.25)
4221.8: extended log -i --grep='uncommon' 5.07(4.82+0.23)
4221.9: perl log -i --grep='uncommon' 5.03(4.78+0.22)
4221.11: fixed log -i --grep='æ' 5.93(5.65+0.25)
4221.12: basic log -i --grep='æ' 5.88(5.62+0.25)
4221.13: extended log -i --grep='æ' 6.02(5.69+0.29)
4221.14: perl log -i --grep='æ' 5.36(5.06+0.29)
See commit ("perf: add a comparison test of grep regex engines",
2017-04-19) for details on the machine the above test run was executed
on.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/perf/p4221-log-grep-engines-fixed.sh | 44 ++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
create mode 100755 t/perf/p4221-log-grep-engines-fixed.sh
diff --git a/t/perf/p4221-log-grep-engines-fixed.sh b/t/perf/p4221-log-grep-engines-fixed.sh
new file mode 100755
index 0000000000..060971265a
--- /dev/null
+++ b/t/perf/p4221-log-grep-engines-fixed.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+test_description="Comparison of git-log's --grep regex engines with -F
+
+Set GIT_PERF_4221_LOG_OPTS in the environment to pass options to
+git-grep. Make sure to include a leading space,
+e.g. GIT_PERF_4221_LOG_OPTS=' -i'. Some options to try:
+
+ -i
+ --invert-grep
+ -i --invert-grep
+"
+
+. ./perf-lib.sh
+
+test_perf_large_repo
+test_checkout_worktree
+
+for pattern in 'int' 'uncommon' 'æ'
+do
+ for engine in fixed basic extended perl
+ do
+ if test $engine = "perl" && ! test_have_prereq PCRE
+ then
+ prereq="PCRE"
+ else
+ prereq=""
+ fi
+ test_perf $prereq "$engine log$GIT_PERF_4221_LOG_OPTS --grep='$pattern'" "
+ git -c grep.patternType=$engine log --pretty=format:%h$GIT_PERF_4221_LOG_OPTS --grep='$pattern' >'out.$engine' || :
+ "
+ done
+
+ test_expect_success "assert that all engines found the same for$GIT_PERF_4221_LOG_OPTS '$pattern'" '
+ test_cmp out.fixed out.basic &&
+ test_cmp out.fixed out.extended &&
+ if test_have_prereq PCRE
+ then
+ test_cmp out.fixed out.perl
+ fi
+ '
+done
+
+test_done
--
2.13.0.303.g4ebf302169
next prev parent reply other threads:[~2017-05-25 19:47 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-25 19:45 [PATCH v4 00/31] Easy to review grep & pre-PCRE changes Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 01/31] Makefile & configure: reword inaccurate comment about PCRE Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 02/31] grep & rev-list doc: stop promising libpcre for --perl-regexp Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 03/31] test-lib: rename the LIBPCRE prerequisite to PCRE Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 04/31] log: add exhaustive tests for pattern style options & config Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 05/31] log: make --regexp-ignore-case work with --perl-regexp Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 06/31] grep: add a test asserting that --perl-regexp dies when !PCRE Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 07/31] grep: add a test for backreferences in PCRE patterns Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 08/31] grep: change non-ASCII -i test to stop using --debug Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 09/31] grep: add tests for --threads=N and grep.threads Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 10/31] grep: amend submodule recursion test for regex engine testing Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 11/31] grep: add tests for grep pattern types being passed to submodules Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 12/31] grep: add a test helper function for less verbose -f \0 tests Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 13/31] grep: prepare for testing binary regexes containing rx metacharacters Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 14/31] grep: add tests to fix blind spots with \0 patterns Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 15/31] perf: add a GIT_PERF_MAKE_COMMAND for when *_MAKE_OPTS won't do Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 16/31] perf: emit progress output when unpacking & building Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 17/31] perf: add a comparison test of grep regex engines Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 18/31] perf: add a comparison test of grep regex engines with -F Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 19/31] perf: add a comparison test of log --grep regex engines Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` Ævar Arnfjörð Bjarmason [this message]
2017-05-25 19:45 ` [PATCH v4 21/31] grep: catch a missing enum in switch statement Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 22/31] grep: remove redundant regflags assignments Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 23/31] grep: factor test for \0 in grep patterns into a function Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 24/31] grep: change the internal PCRE macro names to be PCRE1 Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 25/31] grep: change internal *pcre* variable & function names to be *pcre1* Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 26/31] grep: move is_fixed() earlier to avoid forward declaration Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 27/31] test-lib: add a PTHREADS prerequisite Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 28/31] pack-objects & index-pack: add test for --threads warning Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 29/31] pack-objects: fix buggy warning about threads Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 30/31] grep: given --threads with NO_PTHREADS=YesPlease, warn Ævar Arnfjörð Bjarmason
2017-05-25 19:45 ` [PATCH v4 31/31] grep: assert that threading is enabled when calling grep_{lock,unlock} Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170525194535.9324-21-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=bmwill@google.com \
--cc=dark.panda@gmail.com \
--cc=frekui@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=michal.kiedrowicz@gmail.com \
--cc=noloader@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=vleschuk@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).