Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 367c53c08f84bb554a3aae18b65e5419fe4b164a

Authored by Jiri Olsa
Committed by Arnaldo Carvalho de Melo
1 parent eec574e6bc
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

perf diff: Use internal rb tree for hists__precompute 

There's missing change for hists__precompute to iterate either
entries_collapsed or entries_in tree. The change was initiated
for hists_compute_resort function in commit:

  66f97ed perf diff: Use internal rb tree for compute resort

but was missing for hists__precompute function changes.

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1355404152-16523-2-git-send-email-jolsa@redhat.com
[ committer note: Reduce patch size, no functional change ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 1 changed file with 10 additions and 3 deletions Inline Diff

tools/perf/builtin-diff.c
Diff comments   View file @ 367c53c
1 /* 1 /*
2 * builtin-diff.c 2 * builtin-diff.c
3 * 3 *
4 * Builtin diff command: Analyze two perf.data input files, look up and read 4 * Builtin diff command: Analyze two perf.data input files, look up and read
5 * DSOs and symbol information, sort them and produce a diff. 5 * DSOs and symbol information, sort them and produce a diff.
6 */ 6 */
7 #include "builtin.h" 7 #include "builtin.h"
8 8
9 #include "util/debug.h" 9 #include "util/debug.h"
10 #include "util/event.h" 10 #include "util/event.h"
11 #include "util/hist.h" 11 #include "util/hist.h"
12 #include "util/evsel.h" 12 #include "util/evsel.h"
13 #include "util/evlist.h" 13 #include "util/evlist.h"
14 #include "util/session.h" 14 #include "util/session.h"
15 #include "util/tool.h" 15 #include "util/tool.h"
16 #include "util/sort.h" 16 #include "util/sort.h"
17 #include "util/symbol.h" 17 #include "util/symbol.h"
18 #include "util/util.h" 18 #include "util/util.h"
19 19
20 #include <stdlib.h> 20 #include <stdlib.h>
21 21
22 static char const *input_old = "perf.data.old", 22 static char const *input_old = "perf.data.old",
23 *input_new = "perf.data"; 23 *input_new = "perf.data";
24 static char diff__default_sort_order[] = "dso,symbol"; 24 static char diff__default_sort_order[] = "dso,symbol";
25 static bool force; 25 static bool force;
26 static bool show_period; 26 static bool show_period;
27 static bool show_formula; 27 static bool show_formula;
28 static bool show_baseline_only; 28 static bool show_baseline_only;
29 static bool sort_compute; 29 static bool sort_compute;
30 30
31 static s64 compute_wdiff_w1; 31 static s64 compute_wdiff_w1;
32 static s64 compute_wdiff_w2; 32 static s64 compute_wdiff_w2;
33 33
34 enum { 34 enum {
35 COMPUTE_DELTA, 35 COMPUTE_DELTA,
36 COMPUTE_RATIO, 36 COMPUTE_RATIO,
37 COMPUTE_WEIGHTED_DIFF, 37 COMPUTE_WEIGHTED_DIFF,
38 COMPUTE_MAX, 38 COMPUTE_MAX,
39 }; 39 };
40 40
41 const char *compute_names[COMPUTE_MAX] = { 41 const char *compute_names[COMPUTE_MAX] = {
42 [COMPUTE_DELTA] = "delta", 42 [COMPUTE_DELTA] = "delta",
43 [COMPUTE_RATIO] = "ratio", 43 [COMPUTE_RATIO] = "ratio",
44 [COMPUTE_WEIGHTED_DIFF] = "wdiff", 44 [COMPUTE_WEIGHTED_DIFF] = "wdiff",
45 }; 45 };
46 46
47 static int compute; 47 static int compute;
48 48
49 static int setup_compute_opt_wdiff(char *opt) 49 static int setup_compute_opt_wdiff(char *opt)
50 { 50 {
51 char *w1_str = opt; 51 char *w1_str = opt;
52 char *w2_str; 52 char *w2_str;
53 53
54 int ret = -EINVAL; 54 int ret = -EINVAL;
55 55
56 if (!opt) 56 if (!opt)
57 goto out; 57 goto out;
58 58
59 w2_str = strchr(opt, ','); 59 w2_str = strchr(opt, ',');
60 if (!w2_str) 60 if (!w2_str)
61 goto out; 61 goto out;
62 62
63 *w2_str++ = 0x0; 63 *w2_str++ = 0x0;
64 if (!*w2_str) 64 if (!*w2_str)
65 goto out; 65 goto out;
66 66
67 compute_wdiff_w1 = strtol(w1_str, NULL, 10); 67 compute_wdiff_w1 = strtol(w1_str, NULL, 10);
68 compute_wdiff_w2 = strtol(w2_str, NULL, 10); 68 compute_wdiff_w2 = strtol(w2_str, NULL, 10);
69 69
70 if (!compute_wdiff_w1 || !compute_wdiff_w2) 70 if (!compute_wdiff_w1 || !compute_wdiff_w2)
71 goto out; 71 goto out;
72 72
73 pr_debug("compute wdiff w1(%" PRId64 ") w2(%" PRId64 ")\n", 73 pr_debug("compute wdiff w1(%" PRId64 ") w2(%" PRId64 ")\n",
74 compute_wdiff_w1, compute_wdiff_w2); 74 compute_wdiff_w1, compute_wdiff_w2);
75 75
76 ret = 0; 76 ret = 0;
77 77
78 out: 78 out:
79 if (ret) 79 if (ret)
80 pr_err("Failed: wrong weight data, use 'wdiff:w1,w2'\n"); 80 pr_err("Failed: wrong weight data, use 'wdiff:w1,w2'\n");
81 81
82 return ret; 82 return ret;
83 } 83 }
84 84
85 static int setup_compute_opt(char *opt) 85 static int setup_compute_opt(char *opt)
86 { 86 {
87 if (compute == COMPUTE_WEIGHTED_DIFF) 87 if (compute == COMPUTE_WEIGHTED_DIFF)
88 return setup_compute_opt_wdiff(opt); 88 return setup_compute_opt_wdiff(opt);
89 89
90 if (opt) { 90 if (opt) {
91 pr_err("Failed: extra option specified '%s'", opt); 91 pr_err("Failed: extra option specified '%s'", opt);
92 return -EINVAL; 92 return -EINVAL;
93 } 93 }
94 94
95 return 0; 95 return 0;
96 } 96 }
97 97
98 static int setup_compute(const struct option *opt, const char *str, 98 static int setup_compute(const struct option *opt, const char *str,
99 int unset __maybe_unused) 99 int unset __maybe_unused)
100 { 100 {
101 int *cp = (int *) opt->value; 101 int *cp = (int *) opt->value;
102 char *cstr = (char *) str; 102 char *cstr = (char *) str;
103 char buf[50]; 103 char buf[50];
104 unsigned i; 104 unsigned i;
105 char *option; 105 char *option;
106 106
107 if (!str) { 107 if (!str) {
108 *cp = COMPUTE_DELTA; 108 *cp = COMPUTE_DELTA;
109 return 0; 109 return 0;
110 } 110 }
111 111
112 if (*str == '+') { 112 if (*str == '+') {
113 sort_compute = true; 113 sort_compute = true;
114 cstr = (char *) ++str; 114 cstr = (char *) ++str;
115 if (!*str) 115 if (!*str)
116 return 0; 116 return 0;
117 } 117 }
118 118
119 option = strchr(str, ':'); 119 option = strchr(str, ':');
120 if (option) { 120 if (option) {
121 unsigned len = option++ - str; 121 unsigned len = option++ - str;
122 122
123 /* 123 /*
124 * The str data are not writeable, so we need 124 * The str data are not writeable, so we need
125 * to use another buffer. 125 * to use another buffer.
126 */ 126 */
127 127
128 /* No option value is longer. */ 128 /* No option value is longer. */
129 if (len >= sizeof(buf)) 129 if (len >= sizeof(buf))
130 return -EINVAL; 130 return -EINVAL;
131 131
132 strncpy(buf, str, len); 132 strncpy(buf, str, len);
133 buf[len] = 0x0; 133 buf[len] = 0x0;
134 cstr = buf; 134 cstr = buf;
135 } 135 }
136 136
137 for (i = 0; i < COMPUTE_MAX; i++) 137 for (i = 0; i < COMPUTE_MAX; i++)
138 if (!strcmp(cstr, compute_names[i])) { 138 if (!strcmp(cstr, compute_names[i])) {
139 *cp = i; 139 *cp = i;
140 return setup_compute_opt(option); 140 return setup_compute_opt(option);
141 } 141 }
142 142
143 pr_err("Failed: '%s' is not computation method " 143 pr_err("Failed: '%s' is not computation method "
144 "(use 'delta','ratio' or 'wdiff')\n", str); 144 "(use 'delta','ratio' or 'wdiff')\n", str);
145 return -EINVAL; 145 return -EINVAL;
146 } 146 }
147 147
148 double perf_diff__period_percent(struct hist_entry *he, u64 period) 148 double perf_diff__period_percent(struct hist_entry *he, u64 period)
149 { 149 {
150 u64 total = he->hists->stats.total_period; 150 u64 total = he->hists->stats.total_period;
151 return (period * 100.0) / total; 151 return (period * 100.0) / total;
152 } 152 }
153 153
154 double perf_diff__compute_delta(struct hist_entry *he, struct hist_entry *pair) 154 double perf_diff__compute_delta(struct hist_entry *he, struct hist_entry *pair)
155 { 155 {
156 double new_percent = perf_diff__period_percent(he, he->stat.period); 156 double new_percent = perf_diff__period_percent(he, he->stat.period);
157 double old_percent = perf_diff__period_percent(pair, pair->stat.period); 157 double old_percent = perf_diff__period_percent(pair, pair->stat.period);
158 158
159 he->diff.period_ratio_delta = new_percent - old_percent; 159 he->diff.period_ratio_delta = new_percent - old_percent;
160 he->diff.computed = true; 160 he->diff.computed = true;
161 return he->diff.period_ratio_delta; 161 return he->diff.period_ratio_delta;
162 } 162 }
163 163
164 double perf_diff__compute_ratio(struct hist_entry *he, struct hist_entry *pair) 164 double perf_diff__compute_ratio(struct hist_entry *he, struct hist_entry *pair)
165 { 165 {
166 double new_period = he->stat.period; 166 double new_period = he->stat.period;
167 double old_period = pair->stat.period; 167 double old_period = pair->stat.period;
168 168
169 he->diff.computed = true; 169 he->diff.computed = true;
170 he->diff.period_ratio = new_period / old_period; 170 he->diff.period_ratio = new_period / old_period;
171 return he->diff.period_ratio; 171 return he->diff.period_ratio;
172 } 172 }
173 173
174 s64 perf_diff__compute_wdiff(struct hist_entry *he, struct hist_entry *pair) 174 s64 perf_diff__compute_wdiff(struct hist_entry *he, struct hist_entry *pair)
175 { 175 {
176 u64 new_period = he->stat.period; 176 u64 new_period = he->stat.period;
177 u64 old_period = pair->stat.period; 177 u64 old_period = pair->stat.period;
178 178
179 he->diff.computed = true; 179 he->diff.computed = true;
180 he->diff.wdiff = new_period * compute_wdiff_w2 - 180 he->diff.wdiff = new_period * compute_wdiff_w2 -
181 old_period * compute_wdiff_w1; 181 old_period * compute_wdiff_w1;
182 182
183 return he->diff.wdiff; 183 return he->diff.wdiff;
184 } 184 }
185 185
186 static int formula_delta(struct hist_entry *he, struct hist_entry *pair, 186 static int formula_delta(struct hist_entry *he, struct hist_entry *pair,
187 char *buf, size_t size) 187 char *buf, size_t size)
188 { 188 {
189 return scnprintf(buf, size, 189 return scnprintf(buf, size,
190 "(%" PRIu64 " * 100 / %" PRIu64 ") - " 190 "(%" PRIu64 " * 100 / %" PRIu64 ") - "
191 "(%" PRIu64 " * 100 / %" PRIu64 ")", 191 "(%" PRIu64 " * 100 / %" PRIu64 ")",
192 he->stat.period, he->hists->stats.total_period, 192 he->stat.period, he->hists->stats.total_period,
193 pair->stat.period, pair->hists->stats.total_period); 193 pair->stat.period, pair->hists->stats.total_period);
194 } 194 }
195 195
196 static int formula_ratio(struct hist_entry *he, struct hist_entry *pair, 196 static int formula_ratio(struct hist_entry *he, struct hist_entry *pair,
197 char *buf, size_t size) 197 char *buf, size_t size)
198 { 198 {
199 double new_period = he->stat.period; 199 double new_period = he->stat.period;
200 double old_period = pair->stat.period; 200 double old_period = pair->stat.period;
201 201
202 return scnprintf(buf, size, "%.0F / %.0F", new_period, old_period); 202 return scnprintf(buf, size, "%.0F / %.0F", new_period, old_period);
203 } 203 }
204 204
205 static int formula_wdiff(struct hist_entry *he, struct hist_entry *pair, 205 static int formula_wdiff(struct hist_entry *he, struct hist_entry *pair,
206 char *buf, size_t size) 206 char *buf, size_t size)
207 { 207 {
208 u64 new_period = he->stat.period; 208 u64 new_period = he->stat.period;
209 u64 old_period = pair->stat.period; 209 u64 old_period = pair->stat.period;
210 210
211 return scnprintf(buf, size, 211 return scnprintf(buf, size,
212 "(%" PRIu64 " * " "%" PRId64 ") - (%" PRIu64 " * " "%" PRId64 ")", 212 "(%" PRIu64 " * " "%" PRId64 ") - (%" PRIu64 " * " "%" PRId64 ")",
213 new_period, compute_wdiff_w2, old_period, compute_wdiff_w1); 213 new_period, compute_wdiff_w2, old_period, compute_wdiff_w1);
214 } 214 }
215 215
216 int perf_diff__formula(struct hist_entry *he, struct hist_entry *pair, 216 int perf_diff__formula(struct hist_entry *he, struct hist_entry *pair,
217 char *buf, size_t size) 217 char *buf, size_t size)
218 { 218 {
219 switch (compute) { 219 switch (compute) {
220 case COMPUTE_DELTA: 220 case COMPUTE_DELTA:
221 return formula_delta(he, pair, buf, size); 221 return formula_delta(he, pair, buf, size);
222 case COMPUTE_RATIO: 222 case COMPUTE_RATIO:
223 return formula_ratio(he, pair, buf, size); 223 return formula_ratio(he, pair, buf, size);
224 case COMPUTE_WEIGHTED_DIFF: 224 case COMPUTE_WEIGHTED_DIFF:
225 return formula_wdiff(he, pair, buf, size); 225 return formula_wdiff(he, pair, buf, size);
226 default: 226 default:
227 BUG_ON(1); 227 BUG_ON(1);
228 } 228 }
229 229
230 return -1; 230 return -1;
231 } 231 }
232 232
233 static int hists__add_entry(struct hists *self, 233 static int hists__add_entry(struct hists *self,
234 struct addr_location *al, u64 period, 234 struct addr_location *al, u64 period,
235 u64 weight) 235 u64 weight)
236 { 236 {
237 if (__hists__add_entry(self, al, NULL, period, weight) != NULL) 237 if (__hists__add_entry(self, al, NULL, period, weight) != NULL)
238 return 0; 238 return 0;
239 return -ENOMEM; 239 return -ENOMEM;
240 } 240 }
241 241
242 static int diff__process_sample_event(struct perf_tool *tool __maybe_unused, 242 static int diff__process_sample_event(struct perf_tool *tool __maybe_unused,
243 union perf_event *event, 243 union perf_event *event,
244 struct perf_sample *sample, 244 struct perf_sample *sample,
245 struct perf_evsel *evsel, 245 struct perf_evsel *evsel,
246 struct machine *machine) 246 struct machine *machine)
247 { 247 {
248 struct addr_location al; 248 struct addr_location al;
249 249
250 if (perf_event__preprocess_sample(event, machine, &al, sample, NULL) < 0) { 250 if (perf_event__preprocess_sample(event, machine, &al, sample, NULL) < 0) {
251 pr_warning("problem processing %d event, skipping it.\n", 251 pr_warning("problem processing %d event, skipping it.\n",
252 event->header.type); 252 event->header.type);
253 return -1; 253 return -1;
254 } 254 }
255 255
256 if (al.filtered) 256 if (al.filtered)
257 return 0; 257 return 0;
258 258
259 if (hists__add_entry(&evsel->hists, &al, sample->period, sample->weight)) { 259 if (hists__add_entry(&evsel->hists, &al, sample->period, sample->weight)) {
260 pr_warning("problem incrementing symbol period, skipping event\n"); 260 pr_warning("problem incrementing symbol period, skipping event\n");
261 return -1; 261 return -1;
262 } 262 }
263 263
264 evsel->hists.stats.total_period += sample->period; 264 evsel->hists.stats.total_period += sample->period;
265 return 0; 265 return 0;
266 } 266 }
267 267
268 static struct perf_tool tool = { 268 static struct perf_tool tool = {
269 .sample = diff__process_sample_event, 269 .sample = diff__process_sample_event,
270 .mmap = perf_event__process_mmap, 270 .mmap = perf_event__process_mmap,
271 .comm = perf_event__process_comm, 271 .comm = perf_event__process_comm,
272 .exit = perf_event__process_exit, 272 .exit = perf_event__process_exit,
273 .fork = perf_event__process_fork, 273 .fork = perf_event__process_fork,
274 .lost = perf_event__process_lost, 274 .lost = perf_event__process_lost,
275 .ordered_samples = true, 275 .ordered_samples = true,
276 .ordering_requires_timestamps = true, 276 .ordering_requires_timestamps = true,
277 }; 277 };
278 278
279 static struct perf_evsel *evsel_match(struct perf_evsel *evsel, 279 static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
280 struct perf_evlist *evlist) 280 struct perf_evlist *evlist)
281 { 281 {
282 struct perf_evsel *e; 282 struct perf_evsel *e;
283 283
284 list_for_each_entry(e, &evlist->entries, node) 284 list_for_each_entry(e, &evlist->entries, node)
285 if (perf_evsel__match2(evsel, e)) 285 if (perf_evsel__match2(evsel, e))
286 return e; 286 return e;
287 287
288 return NULL; 288 return NULL;
289 } 289 }
290 290
291 static void perf_evlist__collapse_resort(struct perf_evlist *evlist) 291 static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
292 { 292 {
293 struct perf_evsel *evsel; 293 struct perf_evsel *evsel;
294 294
295 list_for_each_entry(evsel, &evlist->entries, node) { 295 list_for_each_entry(evsel, &evlist->entries, node) {
296 struct hists *hists = &evsel->hists; 296 struct hists *hists = &evsel->hists;
297 297
298 hists__collapse_resort(hists); 298 hists__collapse_resort(hists);
299 } 299 }
300 } 300 }
301 301
302 static void hists__baseline_only(struct hists *hists) 302 static void hists__baseline_only(struct hists *hists)
303 { 303 {
304 struct rb_root *root; 304 struct rb_root *root;
305 struct rb_node *next; 305 struct rb_node *next;
306 306
307 if (sort__need_collapse) 307 if (sort__need_collapse)
308 root = &hists->entries_collapsed; 308 root = &hists->entries_collapsed;
309 else 309 else
310 root = hists->entries_in; 310 root = hists->entries_in;
311 311
312 next = rb_first(root); 312 next = rb_first(root);
313 while (next != NULL) { 313 while (next != NULL) {
314 struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node_in); 314 struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node_in);
315 315
316 next = rb_next(&he->rb_node_in); 316 next = rb_next(&he->rb_node_in);
317 if (!hist_entry__next_pair(he)) { 317 if (!hist_entry__next_pair(he)) {
318 rb_erase(&he->rb_node_in, root); 318 rb_erase(&he->rb_node_in, root);
319 hist_entry__free(he); 319 hist_entry__free(he);
320 } 320 }
321 } 321 }
322 } 322 }
323 323
324 static void hists__precompute(struct hists *hists) 324 static void hists__precompute(struct hists *hists)
325 { 325 {
326 struct rb_node *next = rb_first(&hists->entries); 326 struct rb_root *root;
327 struct rb_node *next;
327 328
329 if (sort__need_collapse)
330 root = &hists->entries_collapsed;
331 else
332 root = hists->entries_in;
333
334 next = rb_first(root);
328 while (next != NULL) { 335 while (next != NULL) {
329 struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node); 336 struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node_in);
330 struct hist_entry *pair = hist_entry__next_pair(he); 337 struct hist_entry *pair = hist_entry__next_pair(he);
331 338
332 next = rb_next(&he->rb_node); 339 next = rb_next(&he->rb_node_in);
333 if (!pair) 340 if (!pair)
334 continue; 341 continue;
335 342
336 switch (compute) { 343 switch (compute) {
337 case COMPUTE_DELTA: 344 case COMPUTE_DELTA:
338 perf_diff__compute_delta(he, pair); 345 perf_diff__compute_delta(he, pair);
339 break; 346 break;
340 case COMPUTE_RATIO: 347 case COMPUTE_RATIO:
341 perf_diff__compute_ratio(he, pair); 348 perf_diff__compute_ratio(he, pair);
342 break; 349 break;
343 case COMPUTE_WEIGHTED_DIFF: 350 case COMPUTE_WEIGHTED_DIFF:
344 perf_diff__compute_wdiff(he, pair); 351 perf_diff__compute_wdiff(he, pair);
345 break; 352 break;
346 default: 353 default:
347 BUG_ON(1); 354 BUG_ON(1);
348 } 355 }
349 } 356 }
350 } 357 }
351 358
352 static int64_t cmp_doubles(double l, double r) 359 static int64_t cmp_doubles(double l, double r)
353 { 360 {
354 if (l > r) 361 if (l > r)
355 return -1; 362 return -1;
356 else if (l < r) 363 else if (l < r)
357 return 1; 364 return 1;
358 else 365 else
359 return 0; 366 return 0;
360 } 367 }
361 368
362 static int64_t 369 static int64_t
363 hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right, 370 hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
364 int c) 371 int c)
365 { 372 {
366 switch (c) { 373 switch (c) {
367 case COMPUTE_DELTA: 374 case COMPUTE_DELTA:
368 { 375 {
369 double l = left->diff.period_ratio_delta; 376 double l = left->diff.period_ratio_delta;
370 double r = right->diff.period_ratio_delta; 377 double r = right->diff.period_ratio_delta;
371 378
372 return cmp_doubles(l, r); 379 return cmp_doubles(l, r);
373 } 380 }
374 case COMPUTE_RATIO: 381 case COMPUTE_RATIO:
375 { 382 {
376 double l = left->diff.period_ratio; 383 double l = left->diff.period_ratio;
377 double r = right->diff.period_ratio; 384 double r = right->diff.period_ratio;
378 385
379 return cmp_doubles(l, r); 386 return cmp_doubles(l, r);
380 } 387 }
381 case COMPUTE_WEIGHTED_DIFF: 388 case COMPUTE_WEIGHTED_DIFF:
382 { 389 {
383 s64 l = left->diff.wdiff; 390 s64 l = left->diff.wdiff;
384 s64 r = right->diff.wdiff; 391 s64 r = right->diff.wdiff;
385 392
386 return r - l; 393 return r - l;
387 } 394 }
388 default: 395 default:
389 BUG_ON(1); 396 BUG_ON(1);
390 } 397 }
391 398
392 return 0; 399 return 0;
393 } 400 }
394 401
395 static void insert_hist_entry_by_compute(struct rb_root *root, 402 static void insert_hist_entry_by_compute(struct rb_root *root,
396 struct hist_entry *he, 403 struct hist_entry *he,
397 int c) 404 int c)
398 { 405 {
399 struct rb_node **p = &root->rb_node; 406 struct rb_node **p = &root->rb_node;
400 struct rb_node *parent = NULL; 407 struct rb_node *parent = NULL;
401 struct hist_entry *iter; 408 struct hist_entry *iter;
402 409
403 while (*p != NULL) { 410 while (*p != NULL) {
404 parent = *p; 411 parent = *p;
405 iter = rb_entry(parent, struct hist_entry, rb_node); 412 iter = rb_entry(parent, struct hist_entry, rb_node);
406 if (hist_entry__cmp_compute(he, iter, c) < 0) 413 if (hist_entry__cmp_compute(he, iter, c) < 0)
407 p = &(*p)->rb_left; 414 p = &(*p)->rb_left;
408 else 415 else
409 p = &(*p)->rb_right; 416 p = &(*p)->rb_right;
410 } 417 }
411 418
412 rb_link_node(&he->rb_node, parent, p); 419 rb_link_node(&he->rb_node, parent, p);
413 rb_insert_color(&he->rb_node, root); 420 rb_insert_color(&he->rb_node, root);
414 } 421 }
415 422
416 static void hists__compute_resort(struct hists *hists) 423 static void hists__compute_resort(struct hists *hists)
417 { 424 {
418 struct rb_root *root; 425 struct rb_root *root;
419 struct rb_node *next; 426 struct rb_node *next;
420 427
421 if (sort__need_collapse) 428 if (sort__need_collapse)
422 root = &hists->entries_collapsed; 429 root = &hists->entries_collapsed;
423 else 430 else
424 root = hists->entries_in; 431 root = hists->entries_in;
425 432
426 hists->entries = RB_ROOT; 433 hists->entries = RB_ROOT;
427 next = rb_first(root); 434 next = rb_first(root);
428 435
429 hists->nr_entries = 0; 436 hists->nr_entries = 0;
430 hists->stats.total_period = 0; 437 hists->stats.total_period = 0;
431 hists__reset_col_len(hists); 438 hists__reset_col_len(hists);
432 439
433 while (next != NULL) { 440 while (next != NULL) {
434 struct hist_entry *he; 441 struct hist_entry *he;
435 442
436 he = rb_entry(next, struct hist_entry, rb_node_in); 443 he = rb_entry(next, struct hist_entry, rb_node_in);
437 next = rb_next(&he->rb_node_in); 444 next = rb_next(&he->rb_node_in);
438 445
439 insert_hist_entry_by_compute(&hists->entries, he, compute); 446 insert_hist_entry_by_compute(&hists->entries, he, compute);
440 hists__inc_nr_entries(hists, he); 447 hists__inc_nr_entries(hists, he);
441 } 448 }
442 } 449 }
443 450
444 static void hists__process(struct hists *old, struct hists *new) 451 static void hists__process(struct hists *old, struct hists *new)
445 { 452 {
446 hists__match(new, old); 453 hists__match(new, old);
447 454
448 if (show_baseline_only) 455 if (show_baseline_only)
449 hists__baseline_only(new); 456 hists__baseline_only(new);
450 else 457 else
451 hists__link(new, old); 458 hists__link(new, old);
452 459
453 if (sort_compute) { 460 if (sort_compute) {
454 hists__precompute(new); 461 hists__precompute(new);
455 hists__compute_resort(new); 462 hists__compute_resort(new);
456 } else { 463 } else {
457 hists__output_resort(new); 464 hists__output_resort(new);
458 } 465 }
459 466
460 hists__fprintf(new, true, 0, 0, 0, stdout); 467 hists__fprintf(new, true, 0, 0, 0, stdout);
461 } 468 }
462 469
463 static int __cmd_diff(void) 470 static int __cmd_diff(void)
464 { 471 {
465 int ret, i; 472 int ret, i;
466 #define older (session[0]) 473 #define older (session[0])
467 #define newer (session[1]) 474 #define newer (session[1])
468 struct perf_session *session[2]; 475 struct perf_session *session[2];
469 struct perf_evlist *evlist_new, *evlist_old; 476 struct perf_evlist *evlist_new, *evlist_old;
470 struct perf_evsel *evsel; 477 struct perf_evsel *evsel;
471 bool first = true; 478 bool first = true;
472 479
473 older = perf_session__new(input_old, O_RDONLY, force, false, 480 older = perf_session__new(input_old, O_RDONLY, force, false,
474 &tool); 481 &tool);
475 newer = perf_session__new(input_new, O_RDONLY, force, false, 482 newer = perf_session__new(input_new, O_RDONLY, force, false,
476 &tool); 483 &tool);
477 if (session[0] == NULL || session[1] == NULL) 484 if (session[0] == NULL || session[1] == NULL)
478 return -ENOMEM; 485 return -ENOMEM;
479 486
480 for (i = 0; i < 2; ++i) { 487 for (i = 0; i < 2; ++i) {
481 ret = perf_session__process_events(session[i], &tool); 488 ret = perf_session__process_events(session[i], &tool);
482 if (ret) 489 if (ret)
483 goto out_delete; 490 goto out_delete;
484 } 491 }
485 492
486 evlist_old = older->evlist; 493 evlist_old = older->evlist;
487 evlist_new = newer->evlist; 494 evlist_new = newer->evlist;
488 495
489 perf_evlist__collapse_resort(evlist_old); 496 perf_evlist__collapse_resort(evlist_old);
490 perf_evlist__collapse_resort(evlist_new); 497 perf_evlist__collapse_resort(evlist_new);
491 498
492 list_for_each_entry(evsel, &evlist_new->entries, node) { 499 list_for_each_entry(evsel, &evlist_new->entries, node) {
493 struct perf_evsel *evsel_old; 500 struct perf_evsel *evsel_old;
494 501
495 evsel_old = evsel_match(evsel, evlist_old); 502 evsel_old = evsel_match(evsel, evlist_old);
496 if (!evsel_old) 503 if (!evsel_old)
497 continue; 504 continue;
498 505
499 fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n", 506 fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n",
500 perf_evsel__name(evsel)); 507 perf_evsel__name(evsel));
501 508
502 first = false; 509 first = false;
503 510
504 hists__process(&evsel_old->hists, &evsel->hists); 511 hists__process(&evsel_old->hists, &evsel->hists);
505 } 512 }
506 513
507 out_delete: 514 out_delete:
508 for (i = 0; i < 2; ++i) 515 for (i = 0; i < 2; ++i)
509 perf_session__delete(session[i]); 516 perf_session__delete(session[i]);
510 return ret; 517 return ret;
511 #undef older 518 #undef older
512 #undef newer 519 #undef newer
513 } 520 }
514 521
515 static const char * const diff_usage[] = { 522 static const char * const diff_usage[] = {
516 "perf diff [<options>] [old_file] [new_file]", 523 "perf diff [<options>] [old_file] [new_file]",
517 NULL, 524 NULL,
518 }; 525 };
519 526
520 static const struct option options[] = { 527 static const struct option options[] = {
521 OPT_INCR('v', "verbose", &verbose, 528 OPT_INCR('v', "verbose", &verbose,
522 "be more verbose (show symbol address, etc)"), 529 "be more verbose (show symbol address, etc)"),
523 OPT_BOOLEAN('b', "baseline-only", &show_baseline_only, 530 OPT_BOOLEAN('b', "baseline-only", &show_baseline_only,
524 "Show only items with match in baseline"), 531 "Show only items with match in baseline"),
525 OPT_CALLBACK('c', "compute", &compute, 532 OPT_CALLBACK('c', "compute", &compute,
526 "delta,ratio,wdiff:w1,w2 (default delta)", 533 "delta,ratio,wdiff:w1,w2 (default delta)",
527 "Entries differential computation selection", 534 "Entries differential computation selection",
528 setup_compute), 535 setup_compute),
529 OPT_BOOLEAN('p', "period", &show_period, 536 OPT_BOOLEAN('p', "period", &show_period,
530 "Show period values."), 537 "Show period values."),
531 OPT_BOOLEAN('F', "formula", &show_formula, 538 OPT_BOOLEAN('F', "formula", &show_formula,
532 "Show formula."), 539 "Show formula."),
533 OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace, 540 OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
534 "dump raw trace in ASCII"), 541 "dump raw trace in ASCII"),
535 OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), 542 OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
536 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules, 543 OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
537 "load module symbols - WARNING: use only with -k and LIVE kernel"), 544 "load module symbols - WARNING: use only with -k and LIVE kernel"),
538 OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]", 545 OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
539 "only consider symbols in these dsos"), 546 "only consider symbols in these dsos"),
540 OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]", 547 OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
541 "only consider symbols in these comms"), 548 "only consider symbols in these comms"),
542 OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]", 549 OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
543 "only consider these symbols"), 550 "only consider these symbols"),
544 OPT_STRING('s', "sort", &sort_order, "key[,key2...]", 551 OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
545 "sort by key(s): pid, comm, dso, symbol, parent"), 552 "sort by key(s): pid, comm, dso, symbol, parent"),
546 OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator", 553 OPT_STRING('t', "field-separator", &symbol_conf.field_sep, "separator",
547 "separator for columns, no spaces will be added between " 554 "separator for columns, no spaces will be added between "
548 "columns '.' is reserved."), 555 "columns '.' is reserved."),
549 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory", 556 OPT_STRING(0, "symfs", &symbol_conf.symfs, "directory",
550 "Look for files with symbols relative to this directory"), 557 "Look for files with symbols relative to this directory"),
551 OPT_END() 558 OPT_END()
552 }; 559 };
553 560
554 static void ui_init(void) 561 static void ui_init(void)
555 { 562 {
556 /* 563 /*
557 * Display baseline/delta/ratio 564 * Display baseline/delta/ratio
558 * formula/periods columns. 565 * formula/periods columns.
559 */ 566 */
560 perf_hpp__column_enable(PERF_HPP__BASELINE); 567 perf_hpp__column_enable(PERF_HPP__BASELINE);
561 568
562 switch (compute) { 569 switch (compute) {
563 case COMPUTE_DELTA: 570 case COMPUTE_DELTA:
564 perf_hpp__column_enable(PERF_HPP__DELTA); 571 perf_hpp__column_enable(PERF_HPP__DELTA);
565 break; 572 break;
566 case COMPUTE_RATIO: 573 case COMPUTE_RATIO:
567 perf_hpp__column_enable(PERF_HPP__RATIO); 574 perf_hpp__column_enable(PERF_HPP__RATIO);
568 break; 575 break;
569 case COMPUTE_WEIGHTED_DIFF: 576 case COMPUTE_WEIGHTED_DIFF:
570 perf_hpp__column_enable(PERF_HPP__WEIGHTED_DIFF); 577 perf_hpp__column_enable(PERF_HPP__WEIGHTED_DIFF);
571 break; 578 break;
572 default: 579 default:
573 BUG_ON(1); 580 BUG_ON(1);
574 }; 581 };
575 582
576 if (show_formula) 583 if (show_formula)
577 perf_hpp__column_enable(PERF_HPP__FORMULA); 584 perf_hpp__column_enable(PERF_HPP__FORMULA);
578 585
579 if (show_period) { 586 if (show_period) {
580 perf_hpp__column_enable(PERF_HPP__PERIOD); 587 perf_hpp__column_enable(PERF_HPP__PERIOD);
581 perf_hpp__column_enable(PERF_HPP__PERIOD_BASELINE); 588 perf_hpp__column_enable(PERF_HPP__PERIOD_BASELINE);
582 } 589 }
583 } 590 }
584 591
585 int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused) 592 int cmd_diff(int argc, const char **argv, const char *prefix __maybe_unused)
586 { 593 {
587 sort_order = diff__default_sort_order; 594 sort_order = diff__default_sort_order;
588 argc = parse_options(argc, argv, options, diff_usage, 0); 595 argc = parse_options(argc, argv, options, diff_usage, 0);
589 if (argc) { 596 if (argc) {
590 if (argc > 2) 597 if (argc > 2)
591 usage_with_options(diff_usage, options); 598 usage_with_options(diff_usage, options);
592 if (argc == 2) { 599 if (argc == 2) {
593 input_old = argv[0]; 600 input_old = argv[0];
594 input_new = argv[1]; 601 input_new = argv[1];
595 } else 602 } else
596 input_new = argv[0]; 603 input_new = argv[0];
597 } else if (symbol_conf.default_guest_vmlinux_name || 604 } else if (symbol_conf.default_guest_vmlinux_name ||
598 symbol_conf.default_guest_kallsyms) { 605 symbol_conf.default_guest_kallsyms) {
599 input_old = "perf.data.host"; 606 input_old = "perf.data.host";
600 input_new = "perf.data.guest"; 607 input_new = "perf.data.guest";
601 } 608 }
602 609
603 symbol_conf.exclude_other = false; 610 symbol_conf.exclude_other = false;
604 if (symbol__init() < 0) 611 if (symbol__init() < 0)
605 return -1; 612 return -1;
606 613
607 ui_init(); 614 ui_init();
608 615
609 if (setup_sorting() < 0) 616 if (setup_sorting() < 0)
610 usage_with_options(diff_usage, options); 617 usage_with_options(diff_usage, options);
611 618
612 setup_pager(); 619 setup_pager();
613 620
614 sort__setup_elide(NULL); 621 sort__setup_elide(NULL);
615 622
616 return __cmd_diff(); 623 return __cmd_diff();
617 } 624 }
618 625