Mercurial > hg
annotate contrib/revsetbenchmarks.py @ 32325:763d72925691
match: use match.prefix() in subdirmatcher
It seems like the subdirmatcher should be checking if the matcher it's
based on is matching prefixes. It was effectively doing that already
because "prefix() == not always() and not anypats() and not
isexact()", subdirmatcher was checking the first two parts of that
condition and I don't think it will ever be given an "exact" matcher
with it's directory name (because exact matchers are for matching
files, not directories). Still, let's switch to using prefix() for
clarity (and because I'm trying to remove code that reaches for
matchers internals).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Wed, 17 May 2017 22:33:15 -0700 |
parents | 984c4d23d39c |
children | e2697acd9381 |
rev | line source |
---|---|
20848
11a9393609c8
revsetbenchmark: simplify and convert the script to python
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20847
diff
changeset
|
1 #!/usr/bin/env python |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
2 |
20746
47fc466825da
contrib: have the revset benchmark test script take a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20745
diff
changeset
|
3 # Measure the performance of a list of revsets against multiple revisions |
47fc466825da
contrib: have the revset benchmark test script take a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20745
diff
changeset
|
4 # defined by parameter. Checkout one by one and run perfrevset with every |
47fc466825da
contrib: have the revset benchmark test script take a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20745
diff
changeset
|
5 # revset in the list to benchmark its performance. |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
6 # |
25535
6d1e456645c9
revsetbenchmarks: fix argument parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25534
diff
changeset
|
7 # You should run this from the root of your mercurial repository. |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
8 # |
25535
6d1e456645c9
revsetbenchmarks: fix argument parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25534
diff
changeset
|
9 # call with --help for details |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
10 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
11 from __future__ import absolute_import, print_function |
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
12 import math |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
13 import optparse # cannot use argparse, python 2.7 only |
21548
651d7548a744
revsetbenchmark: automatically finds the perf extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21287
diff
changeset
|
14 import os |
25530
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
15 import re |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
16 import subprocess |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
17 import sys |
21287
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
18 |
25544
e66f1707ba6c
revsetbenchmarks: use combination variants in default set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25543
diff
changeset
|
19 DEFAULTVARIANTS = ['plain', 'min', 'max', 'first', 'last', |
e66f1707ba6c
revsetbenchmarks: use combination variants in default set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25543
diff
changeset
|
20 'reverse', 'reverse+first', 'reverse+last', |
e66f1707ba6c
revsetbenchmarks: use combination variants in default set
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25543
diff
changeset
|
21 'sort', 'sort+first', 'sort+last'] |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
22 |
20893
b5de9dde181c
revsetbenchmark: remove python 2.7 dependency
Durham Goode <durham@fb.com>
parents:
20855
diff
changeset
|
23 def check_output(*args, **kwargs): |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
24 kwargs.setdefault('stderr', subprocess.PIPE) |
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
25 kwargs.setdefault('stdout', subprocess.PIPE) |
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
26 proc = subprocess.Popen(*args, **kwargs) |
20893
b5de9dde181c
revsetbenchmark: remove python 2.7 dependency
Durham Goode <durham@fb.com>
parents:
20855
diff
changeset
|
27 output, error = proc.communicate() |
b5de9dde181c
revsetbenchmark: remove python 2.7 dependency
Durham Goode <durham@fb.com>
parents:
20855
diff
changeset
|
28 if proc.returncode != 0: |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
29 raise subprocess.CalledProcessError(proc.returncode, ' '.join(args[0])) |
20893
b5de9dde181c
revsetbenchmark: remove python 2.7 dependency
Durham Goode <durham@fb.com>
parents:
20855
diff
changeset
|
30 return output |
20848
11a9393609c8
revsetbenchmark: simplify and convert the script to python
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20847
diff
changeset
|
31 |
20850
d0c2535c7aba
revsetbenchmark: convert update to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20849
diff
changeset
|
32 def update(rev): |
d0c2535c7aba
revsetbenchmark: convert update to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20849
diff
changeset
|
33 """update the repo to a revision""" |
d0c2535c7aba
revsetbenchmark: convert update to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20849
diff
changeset
|
34 try: |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
35 subprocess.check_call(['hg', 'update', '--quiet', '--check', str(rev)]) |
26034
1d829f802fab
revsetbenchmarks: run make after update so that C extensions are built
Yuya Nishihara <yuya@tcha.org>
parents:
25660
diff
changeset
|
36 check_output(['make', 'local'], |
1d829f802fab
revsetbenchmarks: run make after update so that C extensions are built
Yuya Nishihara <yuya@tcha.org>
parents:
25660
diff
changeset
|
37 stderr=None) # suppress output except for error/warning |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
38 except subprocess.CalledProcessError as exc: |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
39 print('update to revision %s failed, aborting'%rev, file=sys.stderr) |
20850
d0c2535c7aba
revsetbenchmark: convert update to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20849
diff
changeset
|
40 sys.exit(exc.returncode) |
d0c2535c7aba
revsetbenchmark: convert update to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20849
diff
changeset
|
41 |
25528
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
42 |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
43 def hg(cmd, repo=None): |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
44 """run a mercurial command |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
45 |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
46 <cmd> is the list of command + argument, |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
47 <repo> is an optional repository path to run this command in.""" |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
48 fullcmd = ['./hg'] |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
49 if repo is not None: |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
50 fullcmd += ['-R', repo] |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
51 fullcmd += ['--config', |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
52 'extensions.perf=' + os.path.join(contribdir, 'perf.py')] |
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
53 fullcmd += cmd |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
54 return check_output(fullcmd, stderr=subprocess.STDOUT) |
25528
a6bcd70cd9c2
revsetbenchmarks: extract call to mercurial into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
23139
diff
changeset
|
55 |
27073
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
56 def perf(revset, target=None, contexts=False): |
20851
4130ec938c84
revsetbenchmark: convert performance call to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20850
diff
changeset
|
57 """run benchmark for this very revset""" |
4130ec938c84
revsetbenchmark: convert performance call to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20850
diff
changeset
|
58 try: |
27073
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
59 args = ['perfrevset', revset] |
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
60 if contexts: |
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
61 args.append('--contexts') |
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
62 output = hg(args, repo=target) |
25530
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
63 return parseoutput(output) |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
64 except subprocess.CalledProcessError as exc: |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
65 print('abort: cannot run revset benchmark: %s'%exc.cmd, file=sys.stderr) |
28073
c4bec3c45ec9
revsetbenchmark: handle exception case
Durham Goode <durham@fb.com>
parents:
27073
diff
changeset
|
66 if getattr(exc, 'output', None) is None: # no output before 2.7 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
67 print('(no output)', file=sys.stderr) |
25529
3e80691d0dfe
revsetbenchmarks: improve error output in case of failure
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25528
diff
changeset
|
68 else: |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
69 print(exc.output, file=sys.stderr) |
25646
57e7a060a06f
revsetbenchmark: do not abort on failure to run a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25642
diff
changeset
|
70 return None |
20851
4130ec938c84
revsetbenchmark: convert performance call to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20850
diff
changeset
|
71 |
25530
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
72 outputre = re.compile(r'! wall (\d+.\d+) comb (\d+.\d+) user (\d+.\d+) ' |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
73 'sys (\d+.\d+) \(best of (\d+)\)') |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
74 |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
75 def parseoutput(output): |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
76 """parse a textual output into a dict |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
77 |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
78 We cannot just use json because we want to compare with old |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
79 versions of Mercurial that may not support json output. |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
80 """ |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
81 match = outputre.search(output) |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
82 if not match: |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
83 print('abort: invalid output:', file=sys.stderr) |
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
84 print(output, file=sys.stderr) |
25530
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
85 sys.exit(1) |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
86 return {'comb': float(match.group(2)), |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
87 'count': int(match.group(5)), |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
88 'sys': float(match.group(3)), |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
89 'user': float(match.group(4)), |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
90 'wall': float(match.group(1)), |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
91 } |
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
92 |
20852
b2353501d6dc
revsetbenchmark: convert revision display to proper subprocesscall
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20851
diff
changeset
|
93 def printrevision(rev): |
b2353501d6dc
revsetbenchmark: convert revision display to proper subprocesscall
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20851
diff
changeset
|
94 """print data about a revision""" |
25538
caff256205ea
revsetbenchmarks: improve revision printing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25537
diff
changeset
|
95 sys.stdout.write("Revision ") |
20852
b2353501d6dc
revsetbenchmark: convert revision display to proper subprocesscall
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20851
diff
changeset
|
96 sys.stdout.flush() |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
97 subprocess.check_call(['hg', 'log', '--rev', str(rev), '--template', |
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
98 '{if(tags, " ({tags})")} ' |
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
99 '{rev}:{node|short}: {desc|firstline}\n']) |
20852
b2353501d6dc
revsetbenchmark: convert revision display to proper subprocesscall
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20851
diff
changeset
|
100 |
25532
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
101 def idxwidth(nbidx): |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
102 """return the max width of number used for index |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
103 |
25533
4bdf6f58aee1
revsetbenchmarks: clarify comment based on irc discussion
Augie Fackler <augie@google.com>
parents:
25532
diff
changeset
|
104 This is similar to log10(nbidx), but we use custom code here |
4bdf6f58aee1
revsetbenchmarks: clarify comment based on irc discussion
Augie Fackler <augie@google.com>
parents:
25532
diff
changeset
|
105 because we start with zero and we'd rather not deal with all the |
4bdf6f58aee1
revsetbenchmarks: clarify comment based on irc discussion
Augie Fackler <augie@google.com>
parents:
25532
diff
changeset
|
106 extra rounding business that log10 would imply. |
4bdf6f58aee1
revsetbenchmarks: clarify comment based on irc discussion
Augie Fackler <augie@google.com>
parents:
25532
diff
changeset
|
107 """ |
25532
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
108 nbidx -= 1 # starts at 0 |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
109 idxwidth = 0 |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
110 while nbidx: |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
111 idxwidth += 1 |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
112 nbidx //= 10 |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
113 if not idxwidth: |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
114 idxwidth = 1 |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
115 return idxwidth |
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
116 |
25539
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
117 def getfactor(main, other, field, sensitivity=0.05): |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
118 """return the relative factor between values for 'field' in main and other |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
119 |
26781
1aee2ab0f902
spelling: trivial spell checking
Mads Kiilerich <madski@unity3d.com>
parents:
26034
diff
changeset
|
120 Return None if the factor is insignificant (less than <sensitivity> |
25539
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
121 variation).""" |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
122 factor = 1 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
123 if main is not None: |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
124 factor = other[field] / main[field] |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
125 low, high = 1 - sensitivity, 1 + sensitivity |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
126 if (low < factor < high): |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
127 return None |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
128 return factor |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
129 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
130 def formatfactor(factor): |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
131 """format a factor into a 4 char string |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
132 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
133 22% |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
134 156% |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
135 x2.4 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
136 x23 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
137 x789 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
138 x1e4 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
139 x5x7 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
140 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
141 """ |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
142 if factor is None: |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
143 return ' ' |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
144 elif factor < 2: |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
145 return '%3i%%' % (factor * 100) |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
146 elif factor < 10: |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
147 return 'x%3.1f' % factor |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
148 elif factor < 1000: |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
149 return '%4s' % ('x%i' % factor) |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
150 else: |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
151 order = int(math.log(factor)) + 1 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
152 while 1 < math.log(factor): |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
153 factor //= 0 |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
154 return 'x%ix%i' % (factor, order) |
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
155 |
25541
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
156 def formattiming(value): |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
157 """format a value to strictly 8 char, dropping some precision if needed""" |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
158 if value < 10**7: |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
159 return ('%.6f' % value)[:8] |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
160 else: |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
161 # value is HUGE very unlikely to happen (4+ month run) |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
162 return '%i' % value |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
163 |
25539
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
164 _marker = object() |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
165 def printresult(variants, idx, data, maxidx, verbose=False, reference=_marker): |
25531
371d8afc9144
revsetbenchmarks: factor out result output into a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25530
diff
changeset
|
166 """print a line of result to stdout""" |
25532
1311aee85dcf
revsetbenchmarks: ensure all indexes have the same width
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25531
diff
changeset
|
167 mask = '%%0%ii) %%s' % idxwidth(maxidx) |
25646
57e7a060a06f
revsetbenchmark: do not abort on failure to run a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25642
diff
changeset
|
168 |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
169 out = [] |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
170 for var in variants: |
25646
57e7a060a06f
revsetbenchmark: do not abort on failure to run a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25642
diff
changeset
|
171 if data[var] is None: |
57e7a060a06f
revsetbenchmark: do not abort on failure to run a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25642
diff
changeset
|
172 out.append('error ') |
57e7a060a06f
revsetbenchmark: do not abort on failure to run a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25642
diff
changeset
|
173 out.append(' ' * 4) |
57e7a060a06f
revsetbenchmark: do not abort on failure to run a revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25642
diff
changeset
|
174 continue |
25541
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
175 out.append(formattiming(data[var]['wall'])) |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
176 if reference is not _marker: |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
177 factor = None |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
178 if reference is not None: |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
179 factor = getfactor(reference[var], data[var], 'wall') |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
180 out.append(formatfactor(factor)) |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
181 if verbose: |
25541
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
182 out.append(formattiming(data[var]['comb'])) |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
183 out.append(formattiming(data[var]['user'])) |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
184 out.append(formattiming(data[var]['sys'])) |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
185 out.append('%6d' % data[var]['count']) |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
186 print(mask % (idx, ' '.join(out))) |
25530
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
187 |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
188 def printheader(variants, maxidx, verbose=False, relative=False): |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
189 header = [' ' * (idxwidth(maxidx) + 1)] |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
190 for var in variants: |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
191 if not var: |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
192 var = 'iter' |
25541
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
193 if 8 < len(var): |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
194 var = var[:3] + '..' + var[-3:] |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
195 header.append('%-8s' % var) |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
196 if relative: |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
197 header.append(' ') |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
198 if verbose: |
25541
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
199 header.append('%-8s' % 'comb') |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
200 header.append('%-8s' % 'user') |
80ce5bce281f
revsetbenchmarks: display even more compact timing result
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25540
diff
changeset
|
201 header.append('%-8s' % 'sys') |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
202 header.append('%6s' % 'count') |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
203 print(' '.join(header)) |
25530
94efef10b63f
revsetbenchmarks: parse perfrevset output into actual number
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25529
diff
changeset
|
204 |
20853
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
205 def getrevs(spec): |
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
206 """get the list of rev matched by a revset""" |
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
207 try: |
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
208 out = check_output(['hg', 'log', '--template={rev}\n', '--rev', spec]) |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
209 except subprocess.CalledProcessError as exc: |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
210 print("abort, can't get revision from %s"%spec, file=sys.stderr) |
20853
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
211 sys.exit(exc.returncode) |
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
212 return [r for r in out.split() if r] |
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
213 |
95293cf67871
revsetbenchmark: get revision to benchmark in a function
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20852
diff
changeset
|
214 |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
215 def applyvariants(revset, variant): |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
216 if variant == 'plain': |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
217 return revset |
25543
36336cc8cfab
revsetbenchmarks: support combining variants with "+"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25542
diff
changeset
|
218 for var in variant.split('+'): |
36336cc8cfab
revsetbenchmarks: support combining variants with "+"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25542
diff
changeset
|
219 revset = '%s(%s)' % (var, revset) |
36336cc8cfab
revsetbenchmarks: support combining variants with "+"
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25542
diff
changeset
|
220 return revset |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
221 |
25607
ddb2a648fdbd
revsetbenchmarks: add main documention for the script
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25546
diff
changeset
|
222 helptext="""This script will run multiple variants of provided revsets using |
ddb2a648fdbd
revsetbenchmarks: add main documention for the script
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25546
diff
changeset
|
223 different revisions in your mercurial repository. After the benchmark are run |
26781
1aee2ab0f902
spelling: trivial spell checking
Mads Kiilerich <madski@unity3d.com>
parents:
26034
diff
changeset
|
224 summary output is provided. Use it to demonstrate speed improvements or pin |
25607
ddb2a648fdbd
revsetbenchmarks: add main documention for the script
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25546
diff
changeset
|
225 point regressions. Revsets to run are specified in a file (or from stdin), one |
ddb2a648fdbd
revsetbenchmarks: add main documention for the script
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25546
diff
changeset
|
226 revsets per line. Line starting with '#' will be ignored, allowing insertion of |
ddb2a648fdbd
revsetbenchmarks: add main documention for the script
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25546
diff
changeset
|
227 comments.""" |
29210
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
228 parser = optparse.OptionParser(usage="usage: %prog [options] <revs>", |
984c4d23d39c
py3: make contrib/revsetbenchmarks.py not import symbols from stdlib modules
Yuya Nishihara <yuya@tcha.org>
parents:
28564
diff
changeset
|
229 description=helptext) |
21287
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
230 parser.add_option("-f", "--file", |
23139
e53f6b72a0e4
spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents:
22556
diff
changeset
|
231 help="read revset from FILE (stdin if omitted)", |
22555
2143d794e960
revsetbenchmark: make it clear that revsets may be read from stdin
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22059
diff
changeset
|
232 metavar="FILE") |
21549
ea3d75ebea6d
revsetbenchmark: support for running on other repo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21548
diff
changeset
|
233 parser.add_option("-R", "--repo", |
ea3d75ebea6d
revsetbenchmark: support for running on other repo
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21548
diff
changeset
|
234 help="run benchmark on REPO", metavar="REPO") |
21287
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
235 |
25537
c1e24e1fd45f
revsetbenchmarks: hide most timing under a --verbose flag
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25536
diff
changeset
|
236 parser.add_option("-v", "--verbose", |
c1e24e1fd45f
revsetbenchmarks: hide most timing under a --verbose flag
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25536
diff
changeset
|
237 action='store_true', |
c1e24e1fd45f
revsetbenchmarks: hide most timing under a --verbose flag
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25536
diff
changeset
|
238 help="display all timing data (not just best total time)") |
c1e24e1fd45f
revsetbenchmarks: hide most timing under a --verbose flag
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25536
diff
changeset
|
239 |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
240 parser.add_option("", "--variants", |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
241 default=','.join(DEFAULTVARIANTS), |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
242 help="comma separated list of variant to test " |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
243 "(eg: plain,min,sorted) (plain = no modification)") |
27073
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
244 parser.add_option('', '--contexts', |
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
245 action='store_true', |
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
246 help='obtain changectx from results instead of integer revs') |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
247 |
21287
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
248 (options, args) = parser.parse_args() |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
249 |
25535
6d1e456645c9
revsetbenchmarks: fix argument parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25534
diff
changeset
|
250 if not args: |
21287
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
251 parser.print_help() |
21286
f0f810096842
revsetbenchmark: add a usage message when no arguments are passed
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21202
diff
changeset
|
252 sys.exit(255) |
f0f810096842
revsetbenchmark: add a usage message when no arguments are passed
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21202
diff
changeset
|
253 |
21548
651d7548a744
revsetbenchmark: automatically finds the perf extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21287
diff
changeset
|
254 # the directory where both this script and the perf.py extension live. |
651d7548a744
revsetbenchmark: automatically finds the perf extension
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21287
diff
changeset
|
255 contribdir = os.path.dirname(__file__) |
21287
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
256 |
20848
11a9393609c8
revsetbenchmark: simplify and convert the script to python
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20847
diff
changeset
|
257 revsetsfile = sys.stdin |
21287
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
258 if options.file: |
2d93b74335a2
revsetbenchmark: use optparse to retrieve argument
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21286
diff
changeset
|
259 revsetsfile = open(options.file) |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
260 |
22556
480a24ad9f77
revsetbenchmark: allow comments ('#' prefix) in the revset input
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
22555
diff
changeset
|
261 revsets = [l.strip() for l in revsetsfile if not l.startswith('#')] |
25642
5265932aad83
revsetbenchmarks: ignore empty lines
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25607
diff
changeset
|
262 revsets = [l for l in revsets if l] |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
263 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
264 print("Revsets to benchmark") |
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
265 print("----------------------------") |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
266 |
20848
11a9393609c8
revsetbenchmark: simplify and convert the script to python
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20847
diff
changeset
|
267 for idx, rset in enumerate(revsets): |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
268 print("%i) %s" % (idx, rset)) |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
269 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
270 print("----------------------------") |
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
271 print() |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
272 |
25535
6d1e456645c9
revsetbenchmarks: fix argument parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25534
diff
changeset
|
273 revs = [] |
6d1e456645c9
revsetbenchmarks: fix argument parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25534
diff
changeset
|
274 for a in args: |
6d1e456645c9
revsetbenchmarks: fix argument parsing
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25534
diff
changeset
|
275 revs.extend(getrevs(a)) |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
276 |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
277 variants = options.variants.split(',') |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
278 |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
279 results = [] |
20848
11a9393609c8
revsetbenchmark: simplify and convert the script to python
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20847
diff
changeset
|
280 for r in revs: |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
281 print("----------------------------") |
20852
b2353501d6dc
revsetbenchmark: convert revision display to proper subprocesscall
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20851
diff
changeset
|
282 printrevision(r) |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
283 print("----------------------------") |
20850
d0c2535c7aba
revsetbenchmark: convert update to proper subprocess call
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20849
diff
changeset
|
284 update(r) |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
285 res = [] |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
286 results.append(res) |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
287 printheader(variants, len(revsets), verbose=options.verbose) |
20848
11a9393609c8
revsetbenchmark: simplify and convert the script to python
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20847
diff
changeset
|
288 for idx, rset in enumerate(revsets): |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
289 varres = {} |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
290 for var in variants: |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
291 varrset = applyvariants(rset, var) |
27073
b9fc042168a4
revsetbenchmarks: support benchmarking changectx loading
Gregory Szorc <gregory.szorc@gmail.com>
parents:
26781
diff
changeset
|
292 data = perf(varrset, target=options.repo, contexts=options.contexts) |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
293 varres[var] = data |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
294 res.append(varres) |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
295 printresult(variants, idx, varres, len(revsets), |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
296 verbose=options.verbose) |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
297 sys.stdout.flush() |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
298 print("----------------------------") |
20745
5fb7c36d751f
contrib: added revset performance benchmarking script
Lucas Moscovicz <lmoscovicz@fb.com>
parents:
diff
changeset
|
299 |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
300 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
301 print(""" |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
302 |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
303 Result by revset |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
304 ================ |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
305 """) |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
306 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
307 print('Revision:') |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
308 for idx, rev in enumerate(revs): |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
309 sys.stdout.write('%i) ' % idx) |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
310 sys.stdout.flush() |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
311 printrevision(rev) |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
312 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
313 print() |
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
314 print() |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
315 |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
316 for ridx, rset in enumerate(revsets): |
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
317 |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
318 print("revset #%i: %s" % (ridx, rset)) |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
319 printheader(variants, len(results), verbose=options.verbose, relative=True) |
25539
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
320 ref = None |
20855
dfad9bb23ab4
revsetbenchmark: add a summary at the end of execution
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
20854
diff
changeset
|
321 for idx, data in enumerate(results): |
25540
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
322 printresult(variants, idx, data[ridx], len(results), |
f08ad5d17e43
revsetbenchmarks: allow running multiple variants per revset
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25539
diff
changeset
|
323 verbose=options.verbose, reference=ref) |
25539
460922c95643
revsetbenchmarks: display relative change when meaningful
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
25538
diff
changeset
|
324 ref = data[ridx] |
28564
6d7da0901a28
contrib: revsetbenchmarks use absolute_import and print_function
Pulkit Goyal <7895pulkit@gmail.com>
parents:
28073
diff
changeset
|
325 print() |