builtin-diff.c 43.8 KB
Newer Older
1
// SPDX-License-Identifier: GPL-2.0
2 3 4 5 6 7 8
/*
 * builtin-diff.c
 *
 * Builtin diff command: Analyze two perf.data input files, look up and read
 * DSOs and symbol information, sort them and produce a diff.
 */
#include "builtin.h"
9
#include "perf.h"
10 11 12 13

#include "util/debug.h"
#include "util/event.h"
#include "util/hist.h"
14
#include "util/evsel.h"
15
#include "util/evlist.h"
16
#include "util/session.h"
17
#include "util/tool.h"
18
#include "util/sort.h"
19
#include "util/srcline.h"
20
#include "util/symbol.h"
21
#include "util/data.h"
22
#include "util/config.h"
23
#include "util/time-utils.h"
24
#include "util/annotate.h"
25
#include "util/map.h"
J
Jin Yao 已提交
26
#include "util/spark.h"
27
#include "util/block-info.h"
28
#include <linux/err.h>
29
#include <linux/zalloc.h>
30
#include <subcmd/pager.h>
31
#include <subcmd/parse-options.h>
32

33
#include <errno.h>
34
#include <inttypes.h>
35
#include <stdlib.h>
36 37
#include <math.h>

38 39 40 41 42 43
struct perf_diff {
	struct perf_tool		 tool;
	const char			*time_str;
	struct perf_time_interval	*ptime_range;
	int				 range_size;
	int				 range_num;
44
	bool				 has_br_stack;
45 46
};

47 48 49 50 51 52 53 54 55
/* Diff command specific HPP columns. */
enum {
	PERF_HPP_DIFF__BASELINE,
	PERF_HPP_DIFF__PERIOD,
	PERF_HPP_DIFF__PERIOD_BASELINE,
	PERF_HPP_DIFF__DELTA,
	PERF_HPP_DIFF__RATIO,
	PERF_HPP_DIFF__WEIGHTED_DIFF,
	PERF_HPP_DIFF__FORMULA,
56
	PERF_HPP_DIFF__DELTA_ABS,
57
	PERF_HPP_DIFF__CYCLES,
J
Jin Yao 已提交
58
	PERF_HPP_DIFF__CYCLES_HIST,
59 60 61 62 63 64 65 66 67 68

	PERF_HPP_DIFF__MAX_INDEX
};

struct diff_hpp_fmt {
	struct perf_hpp_fmt	 fmt;
	int			 idx;
	char			*header;
	int			 header_width;
};
69

70 71
struct data__file {
	struct perf_session	*session;
72
	struct perf_data	 data;
73
	int			 idx;
74
	struct hists		*hists;
75
	struct diff_hpp_fmt	 fmt[PERF_HPP_DIFF__MAX_INDEX];
76 77 78 79 80 81 82 83 84 85 86
};

static struct data__file *data__files;
static int data__files_cnt;

#define data__for_each_file_start(i, d, s)	\
	for (i = s, d = &data__files[s];	\
	     i < data__files_cnt;		\
	     i++, d = &data__files[i])

#define data__for_each_file(i, d) data__for_each_file_start(i, d, 0)
87
#define data__for_each_file_new(i, d) data__for_each_file_start(i, d, 1)
88 89

static bool force;
90
static bool show_period;
91
static bool show_formula;
92
static bool show_baseline_only;
J
Jin Yao 已提交
93
static bool cycles_hist;
94
static unsigned int sort_compute = 1;
95

96 97 98
static s64 compute_wdiff_w1;
static s64 compute_wdiff_w2;

J
Jin Yao 已提交
99 100 101
static const char		*cpu_list;
static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);

102 103 104
enum {
	COMPUTE_DELTA,
	COMPUTE_RATIO,
105
	COMPUTE_WEIGHTED_DIFF,
106
	COMPUTE_DELTA_ABS,
107
	COMPUTE_CYCLES,
108 109 110 111 112
	COMPUTE_MAX,
};

const char *compute_names[COMPUTE_MAX] = {
	[COMPUTE_DELTA] = "delta",
113
	[COMPUTE_DELTA_ABS] = "delta-abs",
114
	[COMPUTE_RATIO] = "ratio",
115
	[COMPUTE_WEIGHTED_DIFF] = "wdiff",
116
	[COMPUTE_CYCLES] = "cycles",
117 118
};

119
static int compute = COMPUTE_DELTA_ABS;
120

121 122
static int compute_2_hpp[COMPUTE_MAX] = {
	[COMPUTE_DELTA]		= PERF_HPP_DIFF__DELTA,
123
	[COMPUTE_DELTA_ABS]	= PERF_HPP_DIFF__DELTA_ABS,
124 125
	[COMPUTE_RATIO]		= PERF_HPP_DIFF__RATIO,
	[COMPUTE_WEIGHTED_DIFF]	= PERF_HPP_DIFF__WEIGHTED_DIFF,
126
	[COMPUTE_CYCLES]	= PERF_HPP_DIFF__CYCLES,
127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
};

#define MAX_COL_WIDTH 70

static struct header_column {
	const char *name;
	int width;
} columns[PERF_HPP_DIFF__MAX_INDEX] = {
	[PERF_HPP_DIFF__BASELINE] = {
		.name  = "Baseline",
	},
	[PERF_HPP_DIFF__PERIOD] = {
		.name  = "Period",
		.width = 14,
	},
	[PERF_HPP_DIFF__PERIOD_BASELINE] = {
		.name  = "Base period",
		.width = 14,
	},
	[PERF_HPP_DIFF__DELTA] = {
		.name  = "Delta",
		.width = 7,
	},
150 151 152 153
	[PERF_HPP_DIFF__DELTA_ABS] = {
		.name  = "Delta Abs",
		.width = 7,
	},
154 155 156 157 158 159 160 161 162 163 164
	[PERF_HPP_DIFF__RATIO] = {
		.name  = "Ratio",
		.width = 14,
	},
	[PERF_HPP_DIFF__WEIGHTED_DIFF] = {
		.name  = "Weighted diff",
		.width = 14,
	},
	[PERF_HPP_DIFF__FORMULA] = {
		.name  = "Formula",
		.width = MAX_COL_WIDTH,
165 166 167 168
	},
	[PERF_HPP_DIFF__CYCLES] = {
		.name  = "[Program Block Range] Cycles Diff",
		.width = 70,
J
Jin Yao 已提交
169 170 171 172
	},
	[PERF_HPP_DIFF__CYCLES_HIST] = {
		.name  = "stddev/Hist",
		.width = NUM_SPARKS + 9,
173 174 175
	}
};

176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224
static int setup_compute_opt_wdiff(char *opt)
{
	char *w1_str = opt;
	char *w2_str;

	int ret = -EINVAL;

	if (!opt)
		goto out;

	w2_str = strchr(opt, ',');
	if (!w2_str)
		goto out;

	*w2_str++ = 0x0;
	if (!*w2_str)
		goto out;

	compute_wdiff_w1 = strtol(w1_str, NULL, 10);
	compute_wdiff_w2 = strtol(w2_str, NULL, 10);

	if (!compute_wdiff_w1 || !compute_wdiff_w2)
		goto out;

	pr_debug("compute wdiff w1(%" PRId64 ") w2(%" PRId64 ")\n",
		  compute_wdiff_w1, compute_wdiff_w2);

	ret = 0;

 out:
	if (ret)
		pr_err("Failed: wrong weight data, use 'wdiff:w1,w2'\n");

	return ret;
}

static int setup_compute_opt(char *opt)
{
	if (compute == COMPUTE_WEIGHTED_DIFF)
		return setup_compute_opt_wdiff(opt);

	if (opt) {
		pr_err("Failed: extra option specified '%s'", opt);
		return -EINVAL;
	}

	return 0;
}

225 226 227 228
static int setup_compute(const struct option *opt, const char *str,
			 int unset __maybe_unused)
{
	int *cp = (int *) opt->value;
229 230
	char *cstr = (char *) str;
	char buf[50];
231
	unsigned i;
232
	char *option;
233 234 235 236 237 238

	if (!str) {
		*cp = COMPUTE_DELTA;
		return 0;
	}

239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256
	option = strchr(str, ':');
	if (option) {
		unsigned len = option++ - str;

		/*
		 * The str data are not writeable, so we need
		 * to use another buffer.
		 */

		/* No option value is longer. */
		if (len >= sizeof(buf))
			return -EINVAL;

		strncpy(buf, str, len);
		buf[len] = 0x0;
		cstr = buf;
	}

257
	for (i = 0; i < COMPUTE_MAX; i++)
258
		if (!strcmp(cstr, compute_names[i])) {
259
			*cp = i;
260
			return setup_compute_opt(option);
261 262 263
		}

	pr_err("Failed: '%s' is not computation method "
264
	       "(use 'delta','ratio' or 'wdiff')\n", str);
265 266 267
	return -EINVAL;
}

268
static double period_percent(struct hist_entry *he, u64 period)
269
{
270 271
	u64 total = hists__total_period(he->hists);

272 273 274
	return (period * 100.0) / total;
}

275
static double compute_delta(struct hist_entry *he, struct hist_entry *pair)
276
{
277 278
	double old_percent = period_percent(he, he->stat.period);
	double new_percent = period_percent(pair, pair->stat.period);
279

280 281 282
	pair->diff.period_ratio_delta = new_percent - old_percent;
	pair->diff.computed = true;
	return pair->diff.period_ratio_delta;
283 284
}

285
static double compute_ratio(struct hist_entry *he, struct hist_entry *pair)
286
{
287 288
	double old_period = he->stat.period ?: 1;
	double new_period = pair->stat.period;
289

290 291 292
	pair->diff.computed = true;
	pair->diff.period_ratio = new_period / old_period;
	return pair->diff.period_ratio;
293 294
}

295
static s64 compute_wdiff(struct hist_entry *he, struct hist_entry *pair)
296
{
297 298
	u64 old_period = he->stat.period;
	u64 new_period = pair->stat.period;
299

300 301 302
	pair->diff.computed = true;
	pair->diff.wdiff = new_period * compute_wdiff_w2 -
			   old_period * compute_wdiff_w1;
303

304
	return pair->diff.wdiff;
305 306
}

307 308
static int formula_delta(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
309
{
310 311 312 313 314 315 316
	u64 he_total = he->hists->stats.total_period;
	u64 pair_total = pair->hists->stats.total_period;

	if (symbol_conf.filter_relative) {
		he_total = he->hists->stats.total_non_filtered_period;
		pair_total = pair->hists->stats.total_non_filtered_period;
	}
317 318 319
	return scnprintf(buf, size,
			 "(%" PRIu64 " * 100 / %" PRIu64 ") - "
			 "(%" PRIu64 " * 100 / %" PRIu64 ")",
320 321
			 pair->stat.period, pair_total,
			 he->stat.period, he_total);
322 323
}

324 325
static int formula_ratio(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
326
{
327 328
	double old_period = he->stat.period;
	double new_period = pair->stat.period;
329 330 331 332

	return scnprintf(buf, size, "%.0F / %.0F", new_period, old_period);
}

333 334
static int formula_wdiff(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
335
{
336 337
	u64 old_period = he->stat.period;
	u64 new_period = pair->stat.period;
338 339 340 341 342 343

	return scnprintf(buf, size,
		  "(%" PRIu64 " * " "%" PRId64 ") - (%" PRIu64 " * " "%" PRId64 ")",
		  new_period, compute_wdiff_w2, old_period, compute_wdiff_w1);
}

344 345
static int formula_fprintf(struct hist_entry *he, struct hist_entry *pair,
			   char *buf, size_t size)
346 347 348
{
	switch (compute) {
	case COMPUTE_DELTA:
349
	case COMPUTE_DELTA_ABS:
350
		return formula_delta(he, pair, buf, size);
351
	case COMPUTE_RATIO:
352
		return formula_ratio(he, pair, buf, size);
353
	case COMPUTE_WEIGHTED_DIFF:
354
		return formula_wdiff(he, pair, buf, size);
355 356 357 358 359 360 361
	default:
		BUG_ON(1);
	}

	return -1;
}

362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386
static void *block_hist_zalloc(size_t size)
{
	struct block_hist *bh;

	bh = zalloc(size + sizeof(*bh));
	if (!bh)
		return NULL;

	return &bh->he;
}

static void block_hist_free(void *he)
{
	struct block_hist *bh;

	bh = container_of(he, struct block_hist, he);
	hists__delete_entries(&bh->block_hists);
	free(bh);
}

struct hist_entry_ops block_hist_ops = {
	.new    = block_hist_zalloc,
	.free   = block_hist_free,
};

387
static int diff__process_sample_event(struct perf_tool *tool,
388
				      union perf_event *event,
389
				      struct perf_sample *sample,
390
				      struct evsel *evsel,
391
				      struct machine *machine)
392
{
393
	struct perf_diff *pdiff = container_of(tool, struct perf_diff, tool);
394
	struct addr_location al;
395
	struct hists *hists = evsel__hists(evsel);
396
	int ret = -1;
397

398 399 400 401 402
	if (perf_time__ranges_skip_sample(pdiff->ptime_range, pdiff->range_num,
					  sample->time)) {
		return 0;
	}

403
	if (machine__resolve(machine, &al, sample) < 0) {
404 405 406 407 408
		pr_warning("problem processing %d event, skipping it.\n",
			   event->header.type);
		return -1;
	}

J
Jin Yao 已提交
409 410 411 412 413
	if (cpu_list && !test_bit(sample->cpu, cpu_bitmap)) {
		ret = 0;
		goto out_put;
	}

414 415 416 417 418 419 420 421 422 423 424 425 426 427 428
	if (compute != COMPUTE_CYCLES) {
		if (!hists__add_entry(hists, &al, NULL, NULL, NULL, sample,
				      true)) {
			pr_warning("problem incrementing symbol period, "
				   "skipping event\n");
			goto out_put;
		}
	} else {
		if (!hists__add_entry_ops(hists, &block_hist_ops, &al, NULL,
					  NULL, NULL, sample, true)) {
			pr_warning("problem incrementing symbol period, "
				   "skipping event\n");
			goto out_put;
		}

429 430
		hist__account_cycles(sample->branch_stack, &al, sample, false,
				     NULL);
431 432
	}

433 434 435 436 437 438
	/*
	 * The total_period is updated here before going to the output
	 * tree since normally only the baseline hists will call
	 * hists__output_resort() and precompute needs the total
	 * period in order to sort entries by percentage delta.
	 */
439
	hists->stats.total_period += sample->period;
440
	if (!al.filtered)
441
		hists->stats.total_non_filtered_period += sample->period;
442 443 444 445
	ret = 0;
out_put:
	addr_location__put(&al);
	return ret;
446 447
}

448 449 450 451 452 453 454 455 456 457 458 459 460
static struct perf_diff pdiff = {
	.tool = {
		.sample	= diff__process_sample_event,
		.mmap	= perf_event__process_mmap,
		.mmap2	= perf_event__process_mmap2,
		.comm	= perf_event__process_comm,
		.exit	= perf_event__process_exit,
		.fork	= perf_event__process_fork,
		.lost	= perf_event__process_lost,
		.namespaces = perf_event__process_namespaces,
		.ordered_events = true,
		.ordering_requires_timestamps = true,
	},
461 462
};

463
static struct evsel *evsel_match(struct evsel *evsel,
464
				      struct evlist *evlist)
465
{
466
	struct evsel *e;
467

468
	evlist__for_each_entry(evlist, e) {
469 470
		if (perf_evsel__match2(evsel, e))
			return e;
471
	}
472 473 474 475

	return NULL;
}

476
static void perf_evlist__collapse_resort(struct evlist *evlist)
477
{
478
	struct evsel *evsel;
479

480
	evlist__for_each_entry(evlist, evsel) {
481
		struct hists *hists = evsel__hists(evsel);
482

483
		hists__collapse_resort(hists, NULL);
484 485 486
	}
}

487 488 489 490 491 492 493 494 495
static struct data__file *fmt_to_data_file(struct perf_hpp_fmt *fmt)
{
	struct diff_hpp_fmt *dfmt = container_of(fmt, struct diff_hpp_fmt, fmt);
	void *ptr = dfmt - dfmt->idx;
	struct data__file *d = container_of(ptr, struct data__file, fmt);

	return d;
}

496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512
static struct hist_entry*
get_pair_data(struct hist_entry *he, struct data__file *d)
{
	if (hist_entry__has_pairs(he)) {
		struct hist_entry *pair;

		list_for_each_entry(pair, &he->pairs.head, pairs.node)
			if (pair->hists == d->hists)
				return pair;
	}

	return NULL;
}

static struct hist_entry*
get_pair_fmt(struct hist_entry *he, struct diff_hpp_fmt *dfmt)
{
513
	struct data__file *d = fmt_to_data_file(&dfmt->fmt);
514 515 516 517

	return get_pair_data(he, d);
}

518 519
static void hists__baseline_only(struct hists *hists)
{
D
Davidlohr Bueso 已提交
520
	struct rb_root_cached *root;
521 522
	struct rb_node *next;

523
	if (hists__has(hists, need_collapse))
524 525 526
		root = &hists->entries_collapsed;
	else
		root = hists->entries_in;
527

D
Davidlohr Bueso 已提交
528
	next = rb_first_cached(root);
529
	while (next != NULL) {
530
		struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node_in);
531

532
		next = rb_next(&he->rb_node_in);
533
		if (!hist_entry__next_pair(he)) {
D
Davidlohr Bueso 已提交
534
			rb_erase_cached(&he->rb_node_in, root);
535
			hist_entry__delete(he);
536 537 538 539
		}
	}
}

540 541 542 543 544 545 546 547 548 549
static int64_t block_cycles_diff_cmp(struct hist_entry *left,
				     struct hist_entry *right)
{
	bool pairs_left  = hist_entry__has_pairs(left);
	bool pairs_right = hist_entry__has_pairs(right);
	s64 l, r;

	if (!pairs_left && !pairs_right)
		return 0;

550 551
	l = llabs(left->diff.cycles);
	r = llabs(right->diff.cycles);
552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567
	return r - l;
}

static int64_t block_sort(struct perf_hpp_fmt *fmt __maybe_unused,
			  struct hist_entry *left, struct hist_entry *right)
{
	return block_cycles_diff_cmp(right, left);
}

static void init_block_hist(struct block_hist *bh)
{
	__hists__init(&bh->block_hists, &bh->block_list);
	perf_hpp_list__init(&bh->block_list);

	INIT_LIST_HEAD(&bh->block_fmt.list);
	INIT_LIST_HEAD(&bh->block_fmt.sort_list);
568
	bh->block_fmt.cmp = block_info__cmp;
569 570 571 572 573 574
	bh->block_fmt.sort = block_sort;
	perf_hpp_list__register_sort_field(&bh->block_list,
					   &bh->block_fmt);
	bh->valid = true;
}

575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612
static int block_pair_cmp(struct hist_entry *a, struct hist_entry *b)
{
	struct block_info *bi_a = a->block_info;
	struct block_info *bi_b = b->block_info;
	int cmp;

	if (!bi_a->sym || !bi_b->sym)
		return -1;

	cmp = strcmp(bi_a->sym->name, bi_b->sym->name);

	if ((!cmp) && (bi_a->start == bi_b->start) && (bi_a->end == bi_b->end))
		return 0;

	return -1;
}

static struct hist_entry *get_block_pair(struct hist_entry *he,
					 struct hists *hists_pair)
{
	struct rb_root_cached *root = hists_pair->entries_in;
	struct rb_node *next = rb_first_cached(root);
	int cmp;

	while (next != NULL) {
		struct hist_entry *he_pair = rb_entry(next, struct hist_entry,
						      rb_node_in);

		next = rb_next(&he_pair->rb_node_in);

		cmp = block_pair_cmp(he_pair, he);
		if (!cmp)
			return he_pair;
	}

	return NULL;
}

J
Jin Yao 已提交
613 614 615 616 617 618 619 620 621 622 623 624 625 626 627
static void init_spark_values(unsigned long *svals, int num)
{
	for (int i = 0; i < num; i++)
		svals[i] = 0;
}

static void update_spark_value(unsigned long *svals, int num,
			       struct stats *stats, u64 val)
{
	int n = stats->n;

	if (n < num)
		svals[n] = val;
}

628 629 630 631 632 633 634 635
static void compute_cycles_diff(struct hist_entry *he,
				struct hist_entry *pair)
{
	pair->diff.computed = true;
	if (pair->block_info->num && he->block_info->num) {
		pair->diff.cycles =
			pair->block_info->cycles_aggr / pair->block_info->num_aggr -
			he->block_info->cycles_aggr / he->block_info->num_aggr;
J
Jin Yao 已提交
636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655

		if (!cycles_hist)
			return;

		init_stats(&pair->diff.stats);
		init_spark_values(pair->diff.svals, NUM_SPARKS);

		for (int i = 0; i < pair->block_info->num; i++) {
			u64 val;

			if (i >= he->block_info->num || i >= NUM_SPARKS)
				break;

			val = labs(pair->block_info->cycles_spark[i] -
				     he->block_info->cycles_spark[i]);

			update_spark_value(pair->diff.svals, NUM_SPARKS,
					   &pair->diff.stats, val);
			update_stats(&pair->diff.stats, val);
		}
656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678
	}
}

static void block_hists_match(struct hists *hists_base,
			      struct hists *hists_pair)
{
	struct rb_root_cached *root = hists_base->entries_in;
	struct rb_node *next = rb_first_cached(root);

	while (next != NULL) {
		struct hist_entry *he = rb_entry(next, struct hist_entry,
						 rb_node_in);
		struct hist_entry *pair = get_block_pair(he, hists_pair);

		next = rb_next(&he->rb_node_in);

		if (pair) {
			hist_entry__add_pair(pair, he);
			compute_cycles_diff(he, pair);
		}
	}
}

679 680
static void hists__precompute(struct hists *hists)
{
D
Davidlohr Bueso 已提交
681
	struct rb_root_cached *root;
682 683
	struct rb_node *next;

684
	if (hists__has(hists, need_collapse))
685 686 687
		root = &hists->entries_collapsed;
	else
		root = hists->entries_in;
688

D
Davidlohr Bueso 已提交
689
	next = rb_first_cached(root);
690
	while (next != NULL) {
691
		struct block_hist *bh, *pair_bh;
692
		struct hist_entry *he, *pair;
693 694
		struct data__file *d;
		int i;
695

696
		he   = rb_entry(next, struct hist_entry, rb_node_in);
697
		next = rb_next(&he->rb_node_in);
698

699 700 701 702 703
		if (compute == COMPUTE_CYCLES) {
			bh = container_of(he, struct block_hist, he);
			init_block_hist(bh);
			block_info__process_sym(he, bh, NULL, 0);
		}
704

705 706 707 708 709 710 711
		data__for_each_file_new(i, d) {
			pair = get_pair_data(he, d);
			if (!pair)
				continue;

			switch (compute) {
			case COMPUTE_DELTA:
712
			case COMPUTE_DELTA_ABS:
713 714 715 716 717 718 719 720
				compute_delta(he, pair);
				break;
			case COMPUTE_RATIO:
				compute_ratio(he, pair);
				break;
			case COMPUTE_WEIGHTED_DIFF:
				compute_wdiff(he, pair);
				break;
721
			case COMPUTE_CYCLES:
722 723
				pair_bh = container_of(pair, struct block_hist,
						       he);
724 725 726 727
				init_block_hist(pair_bh);
				block_info__process_sym(pair, pair_bh, NULL, 0);

				bh = container_of(he, struct block_hist, he);
728 729 730 731

				if (bh->valid && pair_bh->valid) {
					block_hists_match(&bh->block_hists,
							  &pair_bh->block_hists);
732 733
					hists__output_resort(&pair_bh->block_hists,
							     NULL);
734
				}
735
				break;
736 737 738
			default:
				BUG_ON(1);
			}
739 740 741 742 743 744 745 746 747 748 749 750 751 752 753
		}
	}
}

static int64_t cmp_doubles(double l, double r)
{
	if (l > r)
		return -1;
	else if (l < r)
		return 1;
	else
		return 0;
}

static int64_t
754
__hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
755 756 757 758 759 760 761 762 763 764
			int c)
{
	switch (c) {
	case COMPUTE_DELTA:
	{
		double l = left->diff.period_ratio_delta;
		double r = right->diff.period_ratio_delta;

		return cmp_doubles(l, r);
	}
765 766 767 768 769 770 771
	case COMPUTE_DELTA_ABS:
	{
		double l = fabs(left->diff.period_ratio_delta);
		double r = fabs(right->diff.period_ratio_delta);

		return cmp_doubles(l, r);
	}
772 773 774 775 776 777 778
	case COMPUTE_RATIO:
	{
		double l = left->diff.period_ratio;
		double r = right->diff.period_ratio;

		return cmp_doubles(l, r);
	}
779 780 781 782 783 784 785
	case COMPUTE_WEIGHTED_DIFF:
	{
		s64 l = left->diff.wdiff;
		s64 r = right->diff.wdiff;

		return r - l;
	}
786 787 788 789 790 791 792
	default:
		BUG_ON(1);
	}

	return 0;
}

793 794
static int64_t
hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
795
			int c, int sort_idx)
796 797 798 799 800 801 802 803 804 805 806
{
	bool pairs_left  = hist_entry__has_pairs(left);
	bool pairs_right = hist_entry__has_pairs(right);
	struct hist_entry *p_right, *p_left;

	if (!pairs_left && !pairs_right)
		return 0;

	if (!pairs_left || !pairs_right)
		return pairs_left ? -1 : 1;

807 808
	p_left  = get_pair_data(left,  &data__files[sort_idx]);
	p_right = get_pair_data(right, &data__files[sort_idx]);
809 810 811 812 813 814 815 816 817 818 819 820 821 822

	if (!p_left && !p_right)
		return 0;

	if (!p_left || !p_right)
		return p_left ? -1 : 1;

	/*
	 * We have 2 entries of same kind, let's
	 * make the data comparison.
	 */
	return __hist_entry__cmp_compute(p_left, p_right, c);
}

823 824 825 826 827 828 829 830 831 832 833 834 835 836 837
static int64_t
hist_entry__cmp_compute_idx(struct hist_entry *left, struct hist_entry *right,
			    int c, int sort_idx)
{
	struct hist_entry *p_right, *p_left;

	p_left  = get_pair_data(left,  &data__files[sort_idx]);
	p_right = get_pair_data(right, &data__files[sort_idx]);

	if (!p_left && !p_right)
		return 0;

	if (!p_left || !p_right)
		return p_left ? -1 : 1;

838
	if (c != COMPUTE_DELTA && c != COMPUTE_DELTA_ABS) {
839 840 841 842 843 844 845 846 847 848 849 850 851 852 853
		/*
		 * The delta can be computed without the baseline, but
		 * others are not.  Put those entries which have no
		 * values below.
		 */
		if (left->dummy && right->dummy)
			return 0;

		if (left->dummy || right->dummy)
			return left->dummy ? 1 : -1;
	}

	return __hist_entry__cmp_compute(p_left, p_right, c);
}

854
static int64_t
855 856
hist_entry__cmp_nop(struct perf_hpp_fmt *fmt __maybe_unused,
		    struct hist_entry *left __maybe_unused,
857 858 859 860 861 862
		    struct hist_entry *right __maybe_unused)
{
	return 0;
}

static int64_t
863 864
hist_entry__cmp_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
			 struct hist_entry *left, struct hist_entry *right)
865 866 867 868 869 870 871
{
	if (left->stat.period == right->stat.period)
		return 0;
	return left->stat.period > right->stat.period ? 1 : -1;
}

static int64_t
872
hist_entry__cmp_delta(struct perf_hpp_fmt *fmt,
873
		      struct hist_entry *left, struct hist_entry *right)
874
{
875 876 877
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_DELTA, d->idx);
878 879
}

880 881 882 883 884 885 886 887 888
static int64_t
hist_entry__cmp_delta_abs(struct perf_hpp_fmt *fmt,
		      struct hist_entry *left, struct hist_entry *right)
{
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_DELTA_ABS, d->idx);
}

889
static int64_t
890
hist_entry__cmp_ratio(struct perf_hpp_fmt *fmt,
891
		      struct hist_entry *left, struct hist_entry *right)
892
{
893 894 895
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_RATIO, d->idx);
896 897 898
}

static int64_t
899
hist_entry__cmp_wdiff(struct perf_hpp_fmt *fmt,
900
		      struct hist_entry *left, struct hist_entry *right)
901
{
902 903 904
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_WEIGHTED_DIFF, d->idx);
905 906
}

907 908 909 910 911 912 913 914
static int64_t
hist_entry__cmp_delta_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			  struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_DELTA,
					   sort_compute);
}

915 916 917 918 919 920 921 922
static int64_t
hist_entry__cmp_delta_abs_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			      struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_DELTA_ABS,
					   sort_compute);
}

923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938
static int64_t
hist_entry__cmp_ratio_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			  struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_RATIO,
					   sort_compute);
}

static int64_t
hist_entry__cmp_wdiff_idx(struct perf_hpp_fmt *fmt __maybe_unused,
			  struct hist_entry *left, struct hist_entry *right)
{
	return hist_entry__cmp_compute_idx(right, left, COMPUTE_WEIGHTED_DIFF,
					   sort_compute);
}

939
static void hists__process(struct hists *hists)
940 941
{
	if (show_baseline_only)
942
		hists__baseline_only(hists);
943

944
	hists__precompute(hists);
945
	hists__output_resort(hists, NULL);
946

947 948 949
	if (compute == COMPUTE_CYCLES)
		symbol_conf.report_block = true;

N
Namhyung Kim 已提交
950
	hists__fprintf(hists, !quiet, 0, 0, 0, stdout,
951
		       !symbol_conf.use_callchain);
952 953
}

954 955 956 957 958 959 960 961 962
static void data__fprintf(void)
{
	struct data__file *d;
	int i;

	fprintf(stdout, "# Data files:\n");

	data__for_each_file(i, d)
		fprintf(stdout, "#  [%d] %s %s\n",
J
Jiri Olsa 已提交
963
			d->idx, d->data.path,
964 965 966 967 968
			!d->idx ? "(Baseline)" : "");

	fprintf(stdout, "#\n");
}

969
static void data_process(void)
970
{
971
	struct evlist *evlist_base = data__files[0].session->evlist;
972
	struct evsel *evsel_base;
973
	bool first = true;
974

975
	evlist__for_each_entry(evlist_base, evsel_base) {
976
		struct hists *hists_base = evsel__hists(evsel_base);
977 978
		struct data__file *d;
		int i;
979

980
		data__for_each_file_new(i, d) {
981
			struct evlist *evlist = d->session->evlist;
982
			struct evsel *evsel;
983
			struct hists *hists;
984 985 986 987 988

			evsel = evsel_match(evsel_base, evlist);
			if (!evsel)
				continue;

989 990
			hists = evsel__hists(evsel);
			d->hists = hists;
991

992
			hists__match(hists_base, hists);
993 994

			if (!show_baseline_only)
995
				hists__link(hists_base, hists);
996
		}
997

N
Namhyung Kim 已提交
998 999 1000 1001
		if (!quiet) {
			fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n",
				perf_evsel__name(evsel_base));
		}
1002

1003
		first = false;
1004

N
Namhyung Kim 已提交
1005
		if (verbose > 0 || ((data__files_cnt > 2) && !quiet))
1006 1007
			data__fprintf();

1008 1009 1010
		/* Don't sort callchain for perf diff */
		perf_evsel__reset_sample_bit(evsel_base, CALLCHAIN);

1011
		hists__process(hists_base);
1012 1013
	}
}
1014

1015 1016 1017 1018 1019 1020 1021
static void data__free(struct data__file *d)
{
	int col;

	for (col = 0; col < PERF_HPP_DIFF__MAX_INDEX; col++) {
		struct diff_hpp_fmt *fmt = &d->fmt[col];

1022
		zfree(&fmt->header);
1023 1024 1025
	}
}

1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102
static int abstime_str_dup(char **pstr)
{
	char *str = NULL;

	if (pdiff.time_str && strchr(pdiff.time_str, ':')) {
		str = strdup(pdiff.time_str);
		if (!str)
			return -ENOMEM;
	}

	*pstr = str;
	return 0;
}

static int parse_absolute_time(struct data__file *d, char **pstr)
{
	char *p = *pstr;
	int ret;

	/*
	 * Absolute timestamp for one file has the format: a.b,c.d
	 * For multiple files, the format is: a.b,c.d:a.b,c.d
	 */
	p = strchr(*pstr, ':');
	if (p) {
		if (p == *pstr) {
			pr_err("Invalid time string\n");
			return -EINVAL;
		}

		*p = 0;
		p++;
		if (*p == 0) {
			pr_err("Invalid time string\n");
			return -EINVAL;
		}
	}

	ret = perf_time__parse_for_ranges(*pstr, d->session,
					  &pdiff.ptime_range,
					  &pdiff.range_size,
					  &pdiff.range_num);
	if (ret < 0)
		return ret;

	if (!p || *p == 0)
		*pstr = NULL;
	else
		*pstr = p;

	return ret;
}

static int parse_percent_time(struct data__file *d)
{
	int ret;

	ret = perf_time__parse_for_ranges(pdiff.time_str, d->session,
					  &pdiff.ptime_range,
					  &pdiff.range_size,
					  &pdiff.range_num);
	return ret;
}

static int parse_time_str(struct data__file *d, char *abstime_ostr,
			   char **pabstime_tmp)
{
	int ret = 0;

	if (abstime_ostr)
		ret = parse_absolute_time(d, pabstime_tmp);
	else if (pdiff.time_str)
		ret = parse_percent_time(d);

	return ret;
}

1103 1104 1105 1106 1107 1108 1109 1110
static int check_file_brstack(void)
{
	struct data__file *d;
	bool has_br_stack;
	int i;

	data__for_each_file(i, d) {
		d->session = perf_session__new(&d->data, false, &pdiff.tool);
1111
		if (IS_ERR(d->session)) {
1112
			pr_err("Failed to open %s\n", d->data.path);
1113
			return PTR_ERR(d->session);
1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127
		}

		has_br_stack = perf_header__has_feat(&d->session->header,
						     HEADER_BRANCH_STACK);
		perf_session__delete(d->session);
		if (!has_br_stack)
			return 0;
	}

	/* Set only all files having branch stacks */
	pdiff.has_br_stack = true;
	return 0;
}

1128 1129 1130
static int __cmd_diff(void)
{
	struct data__file *d;
1131 1132 1133 1134 1135 1136 1137 1138 1139
	int ret, i;
	char *abstime_ostr, *abstime_tmp;

	ret = abstime_str_dup(&abstime_ostr);
	if (ret)
		return ret;

	abstime_tmp = abstime_ostr;
	ret = -EINVAL;
1140 1141

	data__for_each_file(i, d) {
1142
		d->session = perf_session__new(&d->data, false, &pdiff.tool);
1143 1144
		if (IS_ERR(d->session)) {
			ret = PTR_ERR(d->session);
J
Jiri Olsa 已提交
1145
			pr_err("Failed to open %s\n", d->data.path);
1146 1147
			goto out_delete;
		}
1148

1149 1150 1151 1152 1153 1154
		if (pdiff.time_str) {
			ret = parse_time_str(d, abstime_ostr, &abstime_tmp);
			if (ret < 0)
				goto out_delete;
		}

J
Jin Yao 已提交
1155 1156 1157 1158 1159 1160 1161
		if (cpu_list) {
			ret = perf_session__cpu_bitmap(d->session, cpu_list,
						       cpu_bitmap);
			if (ret < 0)
				goto out_delete;
		}

1162
		ret = perf_session__process_events(d->session);
1163
		if (ret) {
J
Jiri Olsa 已提交
1164
			pr_err("Failed to process %s\n", d->data.path);
1165 1166
			goto out_delete;
		}
1167

1168
		perf_evlist__collapse_resort(d->session->evlist);
1169 1170 1171

		if (pdiff.ptime_range)
			zfree(&pdiff.ptime_range);
1172 1173 1174
	}

	data_process();
1175

1176 1177
 out_delete:
	data__for_each_file(i, d) {
1178
		perf_session__delete(d->session);
1179
		data__free(d);
1180
	}
1181

1182
	free(data__files);
1183 1184 1185 1186 1187 1188 1189

	if (pdiff.ptime_range)
		zfree(&pdiff.ptime_range);

	if (abstime_ostr)
		free(abstime_ostr);

1190 1191 1192
	return ret;
}

1193
static const char * const diff_usage[] = {
1194
	"perf diff [<options>] [old_file] [new_file]",
1195
	NULL,
1196 1197 1198
};

static const struct option options[] = {
1199
	OPT_INCR('v', "verbose", &verbose,
1200
		    "be more verbose (show symbol address, etc)"),
N
Namhyung Kim 已提交
1201
	OPT_BOOLEAN('q', "quiet", &quiet, "Do not show any message"),
1202 1203
	OPT_BOOLEAN('b', "baseline-only", &show_baseline_only,
		    "Show only items with match in baseline"),
1204
	OPT_CALLBACK('c', "compute", &compute,
1205
		     "delta,delta-abs,ratio,wdiff:w1,w2 (default delta-abs),cycles",
1206 1207
		     "Entries differential computation selection",
		     setup_compute),
1208 1209
	OPT_BOOLEAN('p', "period", &show_period,
		    "Show period values."),
1210 1211
	OPT_BOOLEAN('F', "formula", &show_formula,
		    "Show formula."),
J
Jin Yao 已提交
1212 1213 1214
	OPT_BOOLEAN(0, "cycles-hist", &cycles_hist,
		    "Show cycles histogram and standard deviation "
		    "- WARNING: use only with -c cycles."),
1215 1216 1217
	OPT_BOOLEAN('D', "dump-raw-trace", &dump_trace,
		    "dump raw trace in ASCII"),
	OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
D
David Ahern 已提交
1218 1219
	OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
		   "file", "kallsyms pathname"),
1220 1221
	OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
		    "load module symbols - WARNING: use only with -k and LIVE kernel"),
1222 1223 1224 1225 1226 1227
	OPT_STRING('d', "dsos", &symbol_conf.dso_list_str, "dso[,dso...]",
		   "only consider symbols in these dsos"),
	OPT_STRING('C', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
		   "only consider symbols in these comms"),
	OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
		   "only consider these symbols"),
1228
	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
1229 1230
		   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline, ..."
		   " Please refer the man page for the complete list."),
1231
	OPT_STRING_NOEMPTY('t', "field-separator", &symbol_conf.field_sep, "separator",
1232 1233
		   "separator for columns, no spaces will be added between "
		   "columns '.' is reserved."),
1234 1235 1236
	OPT_CALLBACK(0, "symfs", NULL, "directory",
		     "Look for files with symbols relative to this directory",
		     symbol__config_symfs),
1237
	OPT_UINTEGER('o', "order", &sort_compute, "Specify compute sorting."),
1238 1239
	OPT_CALLBACK(0, "percentage", NULL, "relative|absolute",
		     "How to display percentage of filtered entries", parse_filter_percentage),
1240 1241
	OPT_STRING(0, "time", &pdiff.time_str, "str",
		   "Time span (time percent or absolute timestamp)"),
J
Jin Yao 已提交
1242
	OPT_STRING(0, "cpu", &cpu_list, "cpu", "list of cpus to profile"),
1243 1244 1245 1246
	OPT_STRING(0, "pid", &symbol_conf.pid_list_str, "pid[,pid...]",
		   "only consider symbols in these pids"),
	OPT_STRING(0, "tid", &symbol_conf.tid_list_str, "tid[,tid...]",
		   "only consider symbols in these tids"),
1247 1248 1249
	OPT_END()
};

1250
static double baseline_percent(struct hist_entry *he)
1251
{
1252 1253 1254
	u64 total = hists__total_period(he->hists);

	return 100.0 * he->stat.period / total;
1255
}
1256

1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285
static int hpp__color_baseline(struct perf_hpp_fmt *fmt,
			       struct perf_hpp *hpp, struct hist_entry *he)
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);
	double percent = baseline_percent(he);
	char pfmt[20] = " ";

	if (!he->dummy) {
		scnprintf(pfmt, 20, "%%%d.2f%%%%", dfmt->header_width - 1);
		return percent_color_snprintf(hpp->buf, hpp->size,
					      pfmt, percent);
	} else
		return scnprintf(hpp->buf, hpp->size, "%*s",
				 dfmt->header_width, pfmt);
}

static int hpp__entry_baseline(struct hist_entry *he, char *buf, size_t size)
{
	double percent = baseline_percent(he);
	const char *fmt = symbol_conf.field_sep ? "%.2f" : "%6.2f%%";
	int ret = 0;

	if (!he->dummy)
		ret = scnprintf(buf, size, fmt, percent);

	return ret;
}

1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328
static int cycles_printf(struct hist_entry *he, struct hist_entry *pair,
			 struct perf_hpp *hpp, int width)
{
	struct block_hist *bh = container_of(he, struct block_hist, he);
	struct block_hist *bh_pair = container_of(pair, struct block_hist, he);
	struct hist_entry *block_he;
	struct block_info *bi;
	char buf[128];
	char *start_line, *end_line;

	block_he = hists__get_entry(&bh_pair->block_hists, bh->block_idx);
	if (!block_he) {
		hpp->skip = true;
		return 0;
	}

	/*
	 * Avoid printing the warning "addr2line_init failed for ..."
	 */
	symbol_conf.disable_add2line_warn = true;

	bi = block_he->block_info;

	start_line = map__srcline(he->ms.map, bi->sym->start + bi->start,
				  he->ms.sym);

	end_line = map__srcline(he->ms.map, bi->sym->start + bi->end,
				he->ms.sym);

	if ((start_line != SRCLINE_UNKNOWN) && (end_line != SRCLINE_UNKNOWN)) {
		scnprintf(buf, sizeof(buf), "[%s -> %s] %4ld",
			  start_line, end_line, block_he->diff.cycles);
	} else {
		scnprintf(buf, sizeof(buf), "[%7lx -> %7lx] %4ld",
			  bi->start, bi->end, block_he->diff.cycles);
	}

	free_srcline(start_line);
	free_srcline(end_line);

	return scnprintf(hpp->buf, hpp->size, "%*s", width, buf);
}

1329 1330 1331 1332 1333 1334 1335 1336
static int __hpp__color_compare(struct perf_hpp_fmt *fmt,
				struct perf_hpp *hpp, struct hist_entry *he,
				int comparison_method)
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);
	struct hist_entry *pair = get_pair_fmt(he, dfmt);
	double diff;
1337
	s64 wdiff;
1338 1339
	char pfmt[20] = " ";

1340 1341 1342 1343 1344 1345 1346 1347 1348
	if (!pair) {
		if (comparison_method == COMPUTE_CYCLES) {
			struct block_hist *bh;

			bh = container_of(he, struct block_hist, he);
			if (bh->block_idx)
				hpp->skip = true;
		}

1349
		goto no_print;
1350
	}
1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361

	switch (comparison_method) {
	case COMPUTE_DELTA:
		if (pair->diff.computed)
			diff = pair->diff.period_ratio_delta;
		else
			diff = compute_delta(he, pair);

		scnprintf(pfmt, 20, "%%%+d.2f%%%%", dfmt->header_width - 1);
		return percent_color_snprintf(hpp->buf, hpp->size,
					pfmt, diff);
1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372
	case COMPUTE_RATIO:
		if (he->dummy)
			goto dummy_print;
		if (pair->diff.computed)
			diff = pair->diff.period_ratio;
		else
			diff = compute_ratio(he, pair);

		scnprintf(pfmt, 20, "%%%d.6f", dfmt->header_width);
		return value_color_snprintf(hpp->buf, hpp->size,
					pfmt, diff);
1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384
	case COMPUTE_WEIGHTED_DIFF:
		if (he->dummy)
			goto dummy_print;
		if (pair->diff.computed)
			wdiff = pair->diff.wdiff;
		else
			wdiff = compute_wdiff(he, pair);

		scnprintf(pfmt, 20, "%%14ld", dfmt->header_width);
		return color_snprintf(hpp->buf, hpp->size,
				get_percent_color(wdiff),
				pfmt, wdiff);
1385 1386
	case COMPUTE_CYCLES:
		return cycles_printf(he, pair, hpp, dfmt->header_width);
1387 1388 1389 1390
	default:
		BUG_ON(1);
	}
dummy_print:
1391 1392 1393
	return scnprintf(hpp->buf, hpp->size, "%*s",
			dfmt->header_width, "N/A");
no_print:
1394 1395 1396 1397 1398 1399 1400 1401 1402 1403
	return scnprintf(hpp->buf, hpp->size, "%*s",
			dfmt->header_width, pfmt);
}

static int hpp__color_delta(struct perf_hpp_fmt *fmt,
			struct perf_hpp *hpp, struct hist_entry *he)
{
	return __hpp__color_compare(fmt, hpp, he, COMPUTE_DELTA);
}

1404 1405 1406 1407 1408 1409
static int hpp__color_ratio(struct perf_hpp_fmt *fmt,
			struct perf_hpp *hpp, struct hist_entry *he)
{
	return __hpp__color_compare(fmt, hpp, he, COMPUTE_RATIO);
}

1410 1411 1412 1413 1414 1415
static int hpp__color_wdiff(struct perf_hpp_fmt *fmt,
			struct perf_hpp *hpp, struct hist_entry *he)
{
	return __hpp__color_compare(fmt, hpp, he, COMPUTE_WEIGHTED_DIFF);
}

1416 1417 1418 1419 1420 1421
static int hpp__color_cycles(struct perf_hpp_fmt *fmt,
			     struct perf_hpp *hpp, struct hist_entry *he)
{
	return __hpp__color_compare(fmt, hpp, he, COMPUTE_CYCLES);
}

J
Jin Yao 已提交
1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505
static int all_zero(unsigned long *vals, int len)
{
	int i;

	for (i = 0; i < len; i++)
		if (vals[i] != 0)
			return 0;
	return 1;
}

static int print_cycles_spark(char *bf, int size, unsigned long *svals, u64 n)
{
	int printed;

	if (n <= 1)
		return 0;

	if (n > NUM_SPARKS)
		n = NUM_SPARKS;
	if (all_zero(svals, n))
		return 0;

	printed = print_spark(bf, size, svals, n);
	printed += scnprintf(bf + printed, size - printed, " ");
	return printed;
}

static int hpp__color_cycles_hist(struct perf_hpp_fmt *fmt,
			    struct perf_hpp *hpp, struct hist_entry *he)
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);
	struct hist_entry *pair = get_pair_fmt(he, dfmt);
	struct block_hist *bh = container_of(he, struct block_hist, he);
	struct block_hist *bh_pair;
	struct hist_entry *block_he;
	char spark[32], buf[128];
	double r;
	int ret, pad;

	if (!pair) {
		if (bh->block_idx)
			hpp->skip = true;

		goto no_print;
	}

	bh_pair = container_of(pair, struct block_hist, he);

	block_he = hists__get_entry(&bh_pair->block_hists, bh->block_idx);
	if (!block_he) {
		hpp->skip = true;
		goto no_print;
	}

	ret = print_cycles_spark(spark, sizeof(spark), block_he->diff.svals,
				 block_he->diff.stats.n);

	r = rel_stddev_stats(stddev_stats(&block_he->diff.stats),
			     avg_stats(&block_he->diff.stats));

	if (ret) {
		/*
		 * Padding spaces if number of sparks less than NUM_SPARKS
		 * otherwise the output is not aligned.
		 */
		pad = NUM_SPARKS - ((ret - 1) / 3);
		scnprintf(buf, sizeof(buf), "%s%5.1f%% %s", "\u00B1", r, spark);
		ret = scnprintf(hpp->buf, hpp->size, "%*s",
				dfmt->header_width, buf);

		if (pad) {
			ret += scnprintf(hpp->buf + ret, hpp->size - ret,
					 "%-*s", pad, " ");
		}

		return ret;
	}

no_print:
	return scnprintf(hpp->buf, hpp->size, "%*s",
			dfmt->header_width, " ");
}

1506 1507 1508 1509 1510 1511
static void
hpp__entry_unpair(struct hist_entry *he, int idx, char *buf, size_t size)
{
	switch (idx) {
	case PERF_HPP_DIFF__PERIOD_BASELINE:
		scnprintf(buf, size, "%" PRIu64, he->stat.period);
1512
		break;
1513 1514

	default:
1515
		break;
1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528
	}
}

static void
hpp__entry_pair(struct hist_entry *he, struct hist_entry *pair,
		int idx, char *buf, size_t size)
{
	double diff;
	double ratio;
	s64 wdiff;

	switch (idx) {
	case PERF_HPP_DIFF__DELTA:
1529
	case PERF_HPP_DIFF__DELTA_ABS:
1530 1531 1532
		if (pair->diff.computed)
			diff = pair->diff.period_ratio_delta;
		else
1533
			diff = compute_delta(he, pair);
1534

1535
		scnprintf(buf, size, "%+4.2F%%", diff);
1536 1537 1538 1539
		break;

	case PERF_HPP_DIFF__RATIO:
		/* No point for ratio number if we are dummy.. */
1540 1541
		if (he->dummy) {
			scnprintf(buf, size, "N/A");
1542
			break;
1543
		}
1544 1545 1546 1547

		if (pair->diff.computed)
			ratio = pair->diff.period_ratio;
		else
1548
			ratio = compute_ratio(he, pair);
1549 1550 1551 1552 1553 1554 1555

		if (ratio > 0.0)
			scnprintf(buf, size, "%14.6F", ratio);
		break;

	case PERF_HPP_DIFF__WEIGHTED_DIFF:
		/* No point for wdiff number if we are dummy.. */
1556 1557
		if (he->dummy) {
			scnprintf(buf, size, "N/A");
1558
			break;
1559
		}
1560 1561 1562 1563

		if (pair->diff.computed)
			wdiff = pair->diff.wdiff;
		else
1564
			wdiff = compute_wdiff(he, pair);
1565 1566 1567 1568 1569 1570

		if (wdiff != 0)
			scnprintf(buf, size, "%14ld", wdiff);
		break;

	case PERF_HPP_DIFF__FORMULA:
1571
		formula_fprintf(he, pair, buf, size);
1572
		break;
1573 1574 1575 1576 1577

	case PERF_HPP_DIFF__PERIOD:
		scnprintf(buf, size, "%" PRIu64, pair->stat.period);
		break;

1578 1579 1580
	default:
		BUG_ON(1);
	};
1581 1582 1583
}

static void
1584 1585
__hpp__entry_global(struct hist_entry *he, struct diff_hpp_fmt *dfmt,
		    char *buf, size_t size)
1586
{
1587
	struct hist_entry *pair = get_pair_fmt(he, dfmt);
1588
	int idx = dfmt->idx;
1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607

	/* baseline is special */
	if (idx == PERF_HPP_DIFF__BASELINE)
		hpp__entry_baseline(he, buf, size);
	else {
		if (pair)
			hpp__entry_pair(he, pair, idx, buf, size);
		else
			hpp__entry_unpair(he, idx, buf, size);
	}
}

static int hpp__entry_global(struct perf_hpp_fmt *_fmt, struct perf_hpp *hpp,
			     struct hist_entry *he)
{
	struct diff_hpp_fmt *dfmt =
		container_of(_fmt, struct diff_hpp_fmt, fmt);
	char buf[MAX_COL_WIDTH] = " ";

1608
	__hpp__entry_global(he, dfmt, buf, MAX_COL_WIDTH);
1609 1610 1611 1612 1613 1614 1615 1616

	if (symbol_conf.field_sep)
		return scnprintf(hpp->buf, hpp->size, "%s", buf);
	else
		return scnprintf(hpp->buf, hpp->size, "%*s",
				 dfmt->header_width, buf);
}

1617
static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
1618
		       struct hists *hists __maybe_unused,
1619 1620
		       int line __maybe_unused,
		       int *span __maybe_unused)
1621 1622 1623 1624 1625 1626 1627 1628 1629
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);

	BUG_ON(!dfmt->header);
	return scnprintf(hpp->buf, hpp->size, dfmt->header);
}

static int hpp__width(struct perf_hpp_fmt *fmt,
1630
		      struct perf_hpp *hpp __maybe_unused,
1631
		      struct hists *hists __maybe_unused)
1632 1633 1634 1635 1636 1637 1638 1639
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);

	BUG_ON(dfmt->header_width <= 0);
	return dfmt->header_width;
}

1640
static void init_header(struct data__file *d, struct diff_hpp_fmt *dfmt)
1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654
{
#define MAX_HEADER_NAME 100
	char buf_indent[MAX_HEADER_NAME];
	char buf[MAX_HEADER_NAME];
	const char *header = NULL;
	int width = 0;

	BUG_ON(dfmt->idx >= PERF_HPP_DIFF__MAX_INDEX);
	header = columns[dfmt->idx].name;
	width  = columns[dfmt->idx].width;

	/* Only our defined HPP fmts should appear here. */
	BUG_ON(!header);

1655 1656 1657
	if (data__files_cnt > 2)
		scnprintf(buf, MAX_HEADER_NAME, "%s/%d", header, d->idx);

1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671
#define NAME (data__files_cnt > 2 ? buf : header)
	dfmt->header_width = width;
	width = (int) strlen(NAME);
	if (dfmt->header_width < width)
		dfmt->header_width = width;

	scnprintf(buf_indent, MAX_HEADER_NAME, "%*s",
		  dfmt->header_width, NAME);

	dfmt->header = strdup(buf_indent);
#undef MAX_HEADER_NAME
#undef NAME
}

1672
static void data__hpp_register(struct data__file *d, int idx)
1673
{
1674 1675 1676 1677 1678 1679 1680 1681
	struct diff_hpp_fmt *dfmt = &d->fmt[idx];
	struct perf_hpp_fmt *fmt = &dfmt->fmt;

	dfmt->idx = idx;

	fmt->header = hpp__header;
	fmt->width  = hpp__width;
	fmt->entry  = hpp__entry_global;
1682 1683
	fmt->cmp    = hist_entry__cmp_nop;
	fmt->collapse = hist_entry__cmp_nop;
1684 1685

	/* TODO more colors */
1686 1687
	switch (idx) {
	case PERF_HPP_DIFF__BASELINE:
1688
		fmt->color = hpp__color_baseline;
1689
		fmt->sort  = hist_entry__cmp_baseline;
1690 1691 1692
		break;
	case PERF_HPP_DIFF__DELTA:
		fmt->color = hpp__color_delta;
1693
		fmt->sort  = hist_entry__cmp_delta;
1694
		break;
1695 1696
	case PERF_HPP_DIFF__RATIO:
		fmt->color = hpp__color_ratio;
1697
		fmt->sort  = hist_entry__cmp_ratio;
1698
		break;
1699 1700
	case PERF_HPP_DIFF__WEIGHTED_DIFF:
		fmt->color = hpp__color_wdiff;
1701
		fmt->sort  = hist_entry__cmp_wdiff;
1702
		break;
1703 1704 1705 1706
	case PERF_HPP_DIFF__DELTA_ABS:
		fmt->color = hpp__color_delta;
		fmt->sort  = hist_entry__cmp_delta_abs;
		break;
1707 1708 1709 1710
	case PERF_HPP_DIFF__CYCLES:
		fmt->color = hpp__color_cycles;
		fmt->sort  = hist_entry__cmp_nop;
		break;
J
Jin Yao 已提交
1711 1712 1713 1714
	case PERF_HPP_DIFF__CYCLES_HIST:
		fmt->color = hpp__color_cycles_hist;
		fmt->sort  = hist_entry__cmp_nop;
		break;
1715
	default:
1716
		fmt->sort  = hist_entry__cmp_nop;
1717 1718
		break;
	}
1719

1720
	init_header(d, dfmt);
1721
	perf_hpp__column_register(fmt);
1722
	perf_hpp__register_sort_field(fmt);
1723 1724
}

1725
static int ui_init(void)
1726
{
1727
	struct data__file *d;
1728
	struct perf_hpp_fmt *fmt;
1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739
	int i;

	data__for_each_file(i, d) {

		/*
		 * Baseline or compute realted columns:
		 *
		 *   PERF_HPP_DIFF__BASELINE
		 *   PERF_HPP_DIFF__DELTA
		 *   PERF_HPP_DIFF__RATIO
		 *   PERF_HPP_DIFF__WEIGHTED_DIFF
J
Jin Yao 已提交
1740
		 *   PERF_HPP_DIFF__CYCLES
1741 1742 1743
		 */
		data__hpp_register(d, i ? compute_2_hpp[compute] :
					  PERF_HPP_DIFF__BASELINE);
1744

J
Jin Yao 已提交
1745 1746 1747
		if (cycles_hist && i)
			data__hpp_register(d, PERF_HPP_DIFF__CYCLES_HIST);

1748 1749 1750 1751 1752 1753 1754 1755 1756
		/*
		 * And the rest:
		 *
		 * PERF_HPP_DIFF__FORMULA
		 * PERF_HPP_DIFF__PERIOD
		 * PERF_HPP_DIFF__PERIOD_BASELINE
		 */
		if (show_formula && i)
			data__hpp_register(d, PERF_HPP_DIFF__FORMULA);
1757

1758 1759 1760
		if (show_period)
			data__hpp_register(d, i ? PERF_HPP_DIFF__PERIOD :
						  PERF_HPP_DIFF__PERIOD_BASELINE);
1761
	}
1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795

	if (!sort_compute)
		return 0;

	/*
	 * Prepend an fmt to sort on columns at 'sort_compute' first.
	 * This fmt is added only to the sort list but not to the
	 * output fields list.
	 *
	 * Note that this column (data) can be compared twice - one
	 * for this 'sort_compute' fmt and another for the normal
	 * diff_hpp_fmt.  But it shouldn't a problem as most entries
	 * will be sorted out by first try or baseline and comparing
	 * is not a costly operation.
	 */
	fmt = zalloc(sizeof(*fmt));
	if (fmt == NULL) {
		pr_err("Memory allocation failed\n");
		return -1;
	}

	fmt->cmp      = hist_entry__cmp_nop;
	fmt->collapse = hist_entry__cmp_nop;

	switch (compute) {
	case COMPUTE_DELTA:
		fmt->sort = hist_entry__cmp_delta_idx;
		break;
	case COMPUTE_RATIO:
		fmt->sort = hist_entry__cmp_ratio_idx;
		break;
	case COMPUTE_WEIGHTED_DIFF:
		fmt->sort = hist_entry__cmp_wdiff_idx;
		break;
1796 1797 1798
	case COMPUTE_DELTA_ABS:
		fmt->sort = hist_entry__cmp_delta_abs_idx;
		break;
1799 1800 1801 1802 1803 1804 1805
	case COMPUTE_CYCLES:
		/*
		 * Should set since 'fmt->sort' is called without
		 * checking valid during sorting
		 */
		fmt->sort = hist_entry__cmp_nop;
		break;
1806 1807 1808 1809
	default:
		BUG_ON(1);
	}

1810
	perf_hpp__prepend_sort_field(fmt);
1811
	return 0;
1812 1813
}

1814
static int data_init(int argc, const char **argv)
1815
{
1816 1817 1818 1819 1820
	struct data__file *d;
	static const char *defaults[] = {
		"perf.data.old",
		"perf.data",
	};
1821
	bool use_default = true;
1822 1823 1824 1825
	int i;

	data__files_cnt = 2;

1826
	if (argc) {
1827
		if (argc == 1)
1828
			defaults[1] = argv[0];
1829 1830 1831 1832
		else {
			data__files_cnt = argc;
			use_default = false;
		}
1833
	} else if (perf_guest) {
1834 1835
		defaults[0] = "perf.data.host";
		defaults[1] = "perf.data.guest";
1836 1837
	}

1838 1839 1840 1841 1842
	if (sort_compute >= (unsigned int) data__files_cnt) {
		pr_err("Order option out of limit.\n");
		return -EINVAL;
	}

1843 1844 1845 1846 1847
	data__files = zalloc(sizeof(*data__files) * data__files_cnt);
	if (!data__files)
		return -ENOMEM;

	data__for_each_file(i, d) {
1848
		struct perf_data *data = &d->data;
1849

J
Jiri Olsa 已提交
1850 1851 1852
		data->path  = use_default ? defaults[i] : argv[i];
		data->mode  = PERF_DATA_MODE_READ,
		data->force = force,
1853

1854 1855 1856 1857 1858 1859
		d->idx  = i;
	}

	return 0;
}

1860 1861 1862 1863
static int diff__config(const char *var, const char *value,
			void *cb __maybe_unused)
{
	if (!strcmp(var, "diff.order")) {
1864 1865 1866 1867
		int ret;
		if (perf_config_int(&ret, var, value) < 0)
			return -1;
		sort_compute = ret;
1868 1869
		return 0;
	}
1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883
	if (!strcmp(var, "diff.compute")) {
		if (!strcmp(value, "delta")) {
			compute = COMPUTE_DELTA;
		} else if (!strcmp(value, "delta-abs")) {
			compute = COMPUTE_DELTA_ABS;
		} else if (!strcmp(value, "ratio")) {
			compute = COMPUTE_RATIO;
		} else if (!strcmp(value, "wdiff")) {
			compute = COMPUTE_WEIGHTED_DIFF;
		} else {
			pr_err("Invalid compute method: %s\n", value);
			return -1;
		}
	}
1884 1885 1886 1887

	return 0;
}

1888
int cmd_diff(int argc, const char **argv)
1889
{
1890 1891 1892 1893 1894
	int ret = hists__init();

	if (ret < 0)
		return ret;

1895 1896
	perf_config(diff__config, NULL);

1897 1898
	argc = parse_options(argc, argv, options, diff_usage, 0);

N
Namhyung Kim 已提交
1899 1900 1901
	if (quiet)
		perf_quiet_option();

J
Jin Yao 已提交
1902 1903 1904
	if (cycles_hist && (compute != COMPUTE_CYCLES))
		usage_with_options(diff_usage, options);

1905 1906
	symbol__annotation_init();

1907
	if (symbol__init(NULL) < 0)
1908 1909
		return -1;

1910 1911 1912
	if (data_init(argc, argv) < 0)
		return -1;

1913 1914 1915
	if (check_file_brstack() < 0)
		return -1;

1916 1917 1918
	if (compute == COMPUTE_CYCLES && !pdiff.has_br_stack)
		return -1;

1919 1920
	if (ui_init() < 0)
		return -1;
1921

1922 1923
	sort__mode = SORT_MODE__DIFF;

1924
	if (setup_sorting(NULL) < 0)
1925 1926
		usage_with_options(diff_usage, options);

1927
	setup_pager();
1928

1929
	sort__setup_elide(NULL);
1930

1931 1932
	return __cmd_diff();
}