perf: amend the grep tests to test grep.threads
Ever since 5b594f457a ("Threaded grep", 2010-01-25) the number of threads git-grep uses under PTHREADS has been hardcoded to 8, but there's no performance test to check whether this is an optimal setting. Amend the existing tests for the grep engines to support a mode where this can be tested, e.g.: GIT_PERF_GREP_THREADS='1 8 16' GIT_PERF_LARGE_REPO=~/g/linux ./run p782* Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Dec 29, 2017 at 22:59 UTC
7b31b55db18f5348ee62ed283f115544bc1049ac
2 files changed
+86
-21
t/perf/p7820-grep-engines.sh
+42
-10
@@ -12,6 +12,9 @@ e.g. GIT_PERF_7820_GREP_OPTS=' -i'. Some options to try:
12
-vi
13
-vw
14
-viw
15
+
16
+If GIT_PERF_GREP_THREADS is set to a list of threads (e.g. '1 4 8'
17
+etc.) we will test the patterns under those numbers of threads.
18
"
19
20
. ./perf-lib.sh
@@ -19,6 +22,11 @@ e.g. GIT_PERF_7820_GREP_OPTS=' -i'. Some options to try:
22
test_perf_large_repo
23
test_checkout_worktree
24
25
+if test -n "$GIT_PERF_GREP_THREADS"
26
+then
27
+ test_set_prereq PERF_GREP_ENGINES_THREADS
28
+fi
29
+
30
for pattern in \
31
'how.to' \
32
'^how to' \
@@ -39,18 +47,42 @@ do
47
else
48
prereq=""
49
fi
42
- test_perf $prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" "
43
- git -c grep.patternType=$engine grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine' || :
44
- "
45
- done
46
-
47
- test_expect_success "assert that all engines found the same for$GIT_PERF_7820_GREP_OPTS '$pattern'" '
48
- test_cmp out.basic out.extended &&
49
- if test_have_prereq PCRE
50
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
51
then
51
- test_cmp out.basic out.perl
52
+ test_perf $prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" "
53
+ git -c grep.patternType=$engine grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine' || :
54
+ "
55
+ else
56
+ for threads in $GIT_PERF_GREP_THREADS
57
+ do
58
+ test_perf PTHREADS,$prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern' with $threads threads" "
59
+ git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine.$threads' || :
60
+ "
61
+ done
62
fi
53
- '
63
+ done
64
+
65
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
66
+ then
67
+ test_expect_success "assert that all engines found the same for$GIT_PERF_7820_GREP_OPTS '$pattern'" '
68
+ test_cmp out.basic out.extended &&
69
+ if test_have_prereq PCRE
70
+ then
71
+ test_cmp out.basic out.perl
72
+ fi
73
+ '
74
+ else
75
+ for threads in $GIT_PERF_GREP_THREADS
76
+ do
77
+ test_expect_success PTHREADS "assert that all engines found the same for$GIT_PERF_7820_GREP_OPTS '$pattern' under threading" "
78
+ test_cmp out.basic.$threads out.extended.$threads &&
79
+ if test_have_prereq PCRE
80
+ then
81
+ test_cmp out.basic.$threads out.perl.$threads
82
+ fi
83
+ "
84
+ done
85
+ fi
86
done
87
88
test_done
t/perf/p7821-grep-engines-fixed.sh
+44
-11
@@ -6,6 +6,9 @@ Set GIT_PERF_7821_GREP_OPTS in the environment to pass options to
6
git-grep. Make sure to include a leading space,
7
e.g. GIT_PERF_7821_GREP_OPTS=' -w'. See p7820-grep-engines.sh for more
8
options to try.
9
+
10
+If GIT_PERF_7821_THREADS is set to a list of threads (e.g. '1 4 8'
11
+etc.) we will test the patterns under those numbers of threads.
12
"
13
14
. ./perf-lib.sh
@@ -13,6 +16,11 @@ options to try.
16
test_perf_large_repo
17
test_checkout_worktree
18
19
+if test -n "$GIT_PERF_GREP_THREADS"
20
+then
21
+ test_set_prereq PERF_GREP_ENGINES_THREADS
22
+fi
23
+
24
for pattern in 'int' 'uncommon' 'æ'
25
do
26
for engine in fixed basic extended perl
@@ -23,19 +31,44 @@ do
31
else
32
prereq=""
33
fi
26
- test_perf $prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" "
27
- git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || :
28
- "
29
- done
30
-
31
- test_expect_success "assert that all engines found the same for$GIT_PERF_7821_GREP_OPTS $pattern" '
32
- test_cmp out.fixed out.basic &&
33
- test_cmp out.fixed out.extended &&
34
- if test_have_prereq PCRE
34
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
35
then
36
- test_cmp out.fixed out.perl
36
+ test_perf $prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" "
37
+ git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || :
38
+ "
39
+ else
40
+ for threads in $GIT_PERF_GREP_THREADS
41
+ do
42
+ test_perf PTHREADS,$prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern with $threads threads" "
43
+ git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine.$threads' || :
44
+ "
45
+ done
46
fi
38
- '
47
+ done
48
+
49
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
50
+ then
51
+ test_expect_success "assert that all engines found the same for$GIT_PERF_7821_GREP_OPTS $pattern" '
52
+ test_cmp out.fixed out.basic &&
53
+ test_cmp out.fixed out.extended &&
54
+ if test_have_prereq PCRE
55
+ then
56
+ test_cmp out.fixed out.perl
57
+ fi
58
+ '
59
+ else
60
+ for threads in $GIT_PERF_GREP_THREADS
61
+ do
62
+ test_expect_success PTHREADS "assert that all engines found the same for$GIT_PERF_7821_GREP_OPTS $pattern under threading" "
63
+ test_cmp out.fixed.$threads out.basic.$threads &&
64
+ test_cmp out.fixed.$threads out.extended.$threads &&
65
+ if test_have_prereq PCRE
66
+ then
67
+ test_cmp out.fixed.$threads out.perl.$threads
68
+ fi
69
+ "
70
+ done
71
+ fi
72
done
73
74
test_done