Show More
@@ -1,213 +1,217 b'' | |||
|
1 | 1 | #!/usr/bin/env python3 |
|
2 | 2 | # compare various algorithm variants for a given case |
|
3 | 3 | # |
|
4 | 4 | # search-discovery-case REPO LOCAL_CASE REMOTE_CASE |
|
5 | 5 | # |
|
6 | 6 | # The description for the case input uses the same format as the ouput of |
|
7 | 7 | # search-discovery-case |
|
8 | 8 | |
|
9 | 9 | import json |
|
10 | 10 | import os |
|
11 | 11 | import subprocess |
|
12 | 12 | import sys |
|
13 | 13 | |
|
14 | 14 | this_script = os.path.abspath(sys.argv[0]) |
|
15 | 15 | script_name = os.path.basename(this_script) |
|
16 | 16 | this_dir = os.path.dirname(this_script) |
|
17 | 17 | hg_dir = os.path.join(this_dir, '..', '..') |
|
18 | 18 | HG_REPO = os.path.normpath(hg_dir) |
|
19 | 19 | HG_BIN = os.path.join(HG_REPO, 'hg') |
|
20 | 20 | |
|
21 | 21 | |
|
22 | 22 | SUBSET_PATH = os.path.join(HG_REPO, 'contrib', 'perf-utils', 'subsetmaker.py') |
|
23 | 23 | |
|
24 | 24 | CMD_BASE = ( |
|
25 | 25 | HG_BIN, |
|
26 | 26 | 'debugdiscovery', |
|
27 | 27 | '--template', |
|
28 | 28 | 'json', |
|
29 | 29 | '--config', |
|
30 | 30 | 'extensions.subset=%s' % SUBSET_PATH, |
|
31 | 31 | ) |
|
32 | 32 | |
|
33 | 33 | # --old |
|
34 | 34 | # --nonheads |
|
35 | 35 | # |
|
36 | 36 | # devel.discovery.exchange-heads=True |
|
37 | 37 | # devel.discovery.grow-sample=True |
|
38 | 38 | # devel.discovery.grow-sample.dynamic=True |
|
39 | 39 | |
|
40 | 40 | VARIANTS = { |
|
41 | 41 | 'tree-discovery': ('--old',), |
|
42 | 42 | 'set-discovery-basic': ( |
|
43 | 43 | '--config', |
|
44 | 44 | 'devel.discovery.exchange-heads=no', |
|
45 | 45 | '--config', |
|
46 | 46 | 'devel.discovery.grow-sample=no', |
|
47 | 47 | '--config', |
|
48 | 48 | 'devel.discovery.grow-sample.dynamic=no', |
|
49 | 49 | '--config', |
|
50 | 50 | 'devel.discovery.randomize=yes', |
|
51 | 51 | ), |
|
52 | 52 | 'set-discovery-heads': ( |
|
53 | 53 | '--config', |
|
54 | 54 | 'devel.discovery.exchange-heads=yes', |
|
55 | 55 | '--config', |
|
56 | 56 | 'devel.discovery.grow-sample=no', |
|
57 | 57 | '--config', |
|
58 | 58 | 'devel.discovery.grow-sample.dynamic=no', |
|
59 | 59 | '--config', |
|
60 | 60 | 'devel.discovery.randomize=yes', |
|
61 | 61 | ), |
|
62 | 62 | 'set-discovery-grow-sample': ( |
|
63 | 63 | '--config', |
|
64 | 64 | 'devel.discovery.exchange-heads=yes', |
|
65 | 65 | '--config', |
|
66 | 66 | 'devel.discovery.grow-sample=yes', |
|
67 | 67 | '--config', |
|
68 | 68 | 'devel.discovery.grow-sample.dynamic=no', |
|
69 | 69 | '--config', |
|
70 | 70 | 'devel.discovery.randomize=yes', |
|
71 | 71 | ), |
|
72 | 72 | 'set-discovery-dynamic-sample': ( |
|
73 | 73 | '--config', |
|
74 | 74 | 'devel.discovery.exchange-heads=yes', |
|
75 | 75 | '--config', |
|
76 | 76 | 'devel.discovery.grow-sample=yes', |
|
77 | 77 | '--config', |
|
78 | 78 | 'devel.discovery.grow-sample.dynamic=yes', |
|
79 | 79 | '--config', |
|
80 | 80 | 'devel.discovery.randomize=yes', |
|
81 | 81 | ), |
|
82 | 82 | 'set-discovery-default': ( |
|
83 | 83 | '--config', |
|
84 | 84 | 'devel.discovery.randomize=yes', |
|
85 | 85 | ), |
|
86 | 86 | } |
|
87 | 87 | |
|
88 | 88 | VARIANTS_KEYS = [ |
|
89 | 89 | 'tree-discovery', |
|
90 | 90 | 'set-discovery-basic', |
|
91 | 91 | 'set-discovery-heads', |
|
92 | 92 | 'set-discovery-grow-sample', |
|
93 | 93 | 'set-discovery-dynamic-sample', |
|
94 | 94 | 'set-discovery-default', |
|
95 | 95 | ] |
|
96 | 96 | |
|
97 | 97 | assert set(VARIANTS.keys()) == set(VARIANTS_KEYS) |
|
98 | 98 | |
|
99 | 99 | |
|
100 | 100 | def format_case(case): |
|
101 | 101 | return '-'.join(str(s) for s in case) |
|
102 | 102 | |
|
103 | 103 | |
|
104 | 104 | def to_revsets(case): |
|
105 | 105 | t = case[0] |
|
106 | 106 | if t == 'scratch': |
|
107 | 107 | return 'not scratch(all(), %d, "%d")' % (case[1], case[2]) |
|
108 | 108 | elif t == 'randomantichain': |
|
109 | 109 | return '::randomantichain(all(), "%d")' % case[1] |
|
110 | 110 | elif t == 'rev': |
|
111 | 111 | return '::%d' % case[1] |
|
112 | 112 | else: |
|
113 | 113 | assert False |
|
114 | 114 | |
|
115 | 115 | |
|
116 | 116 | def compare( |
|
117 | 117 | repo, |
|
118 | 118 | local_case, |
|
119 | 119 | remote_case, |
|
120 | 120 | display_header=True, |
|
121 | display_case=True, | |
|
121 | 122 | ): |
|
122 | 123 | case = (repo, local_case, remote_case) |
|
123 | 124 | if display_header: |
|
124 | print( | |
|
125 | "#", | |
|
126 |
|
|
|
127 |
|
|
|
128 |
|
|
|
125 | pieces = ['#'] | |
|
126 | if display_case: | |
|
127 | pieces += [ | |
|
128 | "repo", | |
|
129 | "local-subset", | |
|
130 | "remote-subset", | |
|
131 | ] | |
|
132 | ||
|
133 | pieces += [ | |
|
129 | 134 | "discovery-variant", |
|
130 | 135 | "roundtrips", |
|
131 | 136 | "queries", |
|
132 | 137 | "revs", |
|
133 | 138 | "local-heads", |
|
134 | 139 | "common-heads", |
|
135 | 140 | "undecided-initial", |
|
136 | 141 | "undecided-common", |
|
137 | 142 | "undecided-missing", |
|
138 |
|
|
|
143 | ] | |
|
144 | print(*pieces) | |
|
139 | 145 | for variant in VARIANTS_KEYS: |
|
140 | 146 | res = process(case, VARIANTS[variant]) |
|
141 | 147 | revs = res["nb-revs"] |
|
142 | 148 | local_heads = res["nb-head-local"] |
|
143 | 149 | common_heads = res["nb-common-heads"] |
|
144 | 150 | roundtrips = res["total-roundtrips"] |
|
145 | 151 | queries = res["total-queries"] |
|
146 | if 'tree-discovery' in variant: | |
|
147 | print( | |
|
152 | pieces = [] | |
|
153 | if display_case: | |
|
154 | pieces += [ | |
|
148 | 155 | repo, |
|
149 | 156 | format_case(local_case), |
|
150 | 157 | format_case(remote_case), |
|
151 |
|
|
|
152 | roundtrips, | |
|
153 |
|
|
|
154 |
|
|
|
155 |
|
|
|
156 |
|
|
|
157 |
|
|
|
158 | else: | |
|
158 | ] | |
|
159 | pieces += [ | |
|
160 | variant, | |
|
161 | roundtrips, | |
|
162 | queries, | |
|
163 | revs, | |
|
164 | local_heads, | |
|
165 | common_heads, | |
|
166 | ] | |
|
167 | if 'tree-discovery' not in variant: | |
|
159 | 168 | undecided_common = res["nb-ini_und-common"] |
|
160 | 169 | undecided_missing = res["nb-ini_und-missing"] |
|
161 | 170 | undecided = undecided_common + undecided_missing |
|
162 |
p |
|
|
163 | repo, | |
|
164 | format_case(local_case), | |
|
165 | format_case(remote_case), | |
|
166 | variant, | |
|
167 | roundtrips, | |
|
168 | queries, | |
|
169 | revs, | |
|
170 | local_heads, | |
|
171 | common_heads, | |
|
171 | pieces += [ | |
|
172 | 172 | undecided, |
|
173 | 173 | undecided_common, |
|
174 | 174 | undecided_missing, |
|
175 |
|
|
|
175 | ] | |
|
176 | print(*pieces) | |
|
176 | 177 | return 0 |
|
177 | 178 | |
|
178 | 179 | |
|
179 | 180 | def process(case, variant): |
|
180 | 181 | (repo, left, right) = case |
|
181 | 182 | cmd = list(CMD_BASE) |
|
182 | 183 | cmd.append('-R') |
|
183 | 184 | cmd.append(repo) |
|
184 | 185 | cmd.append('--local-as-revs') |
|
185 | 186 | cmd.append(to_revsets(left)) |
|
186 | 187 | cmd.append('--remote-as-revs') |
|
187 | 188 | cmd.append(to_revsets(right)) |
|
188 | 189 | cmd.extend(variant) |
|
189 | 190 | s = subprocess.Popen(cmd, stdout=subprocess.PIPE) |
|
190 | 191 | out, err = s.communicate() |
|
191 | 192 | return json.loads(out)[0] |
|
192 | 193 | |
|
193 | 194 | |
|
194 | 195 | if __name__ == '__main__': |
|
195 | 196 | |
|
196 | 197 | argv = sys.argv[:] |
|
197 | 198 | |
|
198 | 199 | kwargs = {} |
|
199 | 200 | # primitive arg parsing |
|
200 | 201 | if '--no-header' in argv: |
|
201 | 202 | kwargs['display_header'] = False |
|
202 | 203 | argv = [a for a in argv if a != '--no-header'] |
|
204 | if '--no-case' in argv: | |
|
205 | kwargs['display_case'] = False | |
|
206 | argv = [a for a in argv if a != '--no-case'] | |
|
203 | 207 | |
|
204 | 208 | if len(argv) != 4: |
|
205 | 209 | usage = f'USAGE: {script_name} REPO LOCAL_CASE REMOTE_CASE' |
|
206 | 210 | print(usage, file=sys.stderr) |
|
207 | 211 | sys.exit(128) |
|
208 | 212 | repo = argv[1] |
|
209 | 213 | local_case = argv[2].split('-') |
|
210 | 214 | local_case = (local_case[0],) + tuple(int(x) for x in local_case[1:]) |
|
211 | 215 | remote_case = argv[3].split('-') |
|
212 | 216 | remote_case = (remote_case[0],) + tuple(int(x) for x in remote_case[1:]) |
|
213 | 217 | sys.exit(compare(repo, local_case, remote_case, **kwargs)) |
General Comments 0
You need to be logged in to leave comments.
Login now