builtin-diff.c 42.5 KB
Newer Older
1
// SPDX-License-Identifier: GPL-2.0
2 3 4 5 6 7 8 9 10 11 12
/*
 * 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"

#include "util/debug.h"
#include "util/event.h"
#include "util/hist.h"
13
#include "util/evsel.h"
14
#include "util/evlist.h"
15
#include "util/session.h"
16
#include "util/tool.h"
17 18
#include "util/sort.h"
#include "util/symbol.h"
19
#include "util/data.h"
20
#include "util/config.h"
21
#include "util/time-utils.h"
22
#include "util/annotate.h"
23
#include "util/map.h"
24
#include <linux/zalloc.h>
25

26
#include <errno.h>
27
#include <inttypes.h>
28
#include <stdlib.h>
29 30
#include <math.h>

31 32 33 34 35 36
struct perf_diff {
	struct perf_tool		 tool;
	const char			*time_str;
	struct perf_time_interval	*ptime_range;
	int				 range_size;
	int				 range_num;
37
	bool				 has_br_stack;
38 39
};

40 41 42 43 44 45 46 47 48
/* 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,
49
	PERF_HPP_DIFF__DELTA_ABS,
50
	PERF_HPP_DIFF__CYCLES,
51 52 53 54 55 56 57 58 59 60

	PERF_HPP_DIFF__MAX_INDEX
};

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

62 63
struct data__file {
	struct perf_session	*session;
64
	struct perf_data	 data;
65
	int			 idx;
66
	struct hists		*hists;
67
	struct diff_hpp_fmt	 fmt[PERF_HPP_DIFF__MAX_INDEX];
68 69 70 71 72 73 74 75 76 77 78
};

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)
79
#define data__for_each_file_new(i, d) data__for_each_file_start(i, d, 1)
80 81

static bool force;
82
static bool show_period;
83
static bool show_formula;
84
static bool show_baseline_only;
85
static unsigned int sort_compute = 1;
86

87 88 89
static s64 compute_wdiff_w1;
static s64 compute_wdiff_w2;

J
Jin Yao 已提交
90 91 92
static const char		*cpu_list;
static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);

93 94
static struct addr_location dummy_al;

95 96 97
enum {
	COMPUTE_DELTA,
	COMPUTE_RATIO,
98
	COMPUTE_WEIGHTED_DIFF,
99
	COMPUTE_DELTA_ABS,
100
	COMPUTE_CYCLES,
101 102 103 104 105
	COMPUTE_MAX,
};

const char *compute_names[COMPUTE_MAX] = {
	[COMPUTE_DELTA] = "delta",
106
	[COMPUTE_DELTA_ABS] = "delta-abs",
107
	[COMPUTE_RATIO] = "ratio",
108
	[COMPUTE_WEIGHTED_DIFF] = "wdiff",
109
	[COMPUTE_CYCLES] = "cycles",
110 111
};

112
static int compute = COMPUTE_DELTA_ABS;
113

114 115
static int compute_2_hpp[COMPUTE_MAX] = {
	[COMPUTE_DELTA]		= PERF_HPP_DIFF__DELTA,
116
	[COMPUTE_DELTA_ABS]	= PERF_HPP_DIFF__DELTA_ABS,
117 118
	[COMPUTE_RATIO]		= PERF_HPP_DIFF__RATIO,
	[COMPUTE_WEIGHTED_DIFF]	= PERF_HPP_DIFF__WEIGHTED_DIFF,
119
	[COMPUTE_CYCLES]	= PERF_HPP_DIFF__CYCLES,
120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142
};

#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,
	},
143 144 145 146
	[PERF_HPP_DIFF__DELTA_ABS] = {
		.name  = "Delta Abs",
		.width = 7,
	},
147 148 149 150 151 152 153 154 155 156 157
	[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,
158 159 160 161
	},
	[PERF_HPP_DIFF__CYCLES] = {
		.name  = "[Program Block Range] Cycles Diff",
		.width = 70,
162 163 164
	}
};

165 166 167 168 169 170 171 172 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
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;
}

214 215 216 217
static int setup_compute(const struct option *opt, const char *str,
			 int unset __maybe_unused)
{
	int *cp = (int *) opt->value;
218 219
	char *cstr = (char *) str;
	char buf[50];
220
	unsigned i;
221
	char *option;
222 223 224 225 226 227

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

228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245
	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;
	}

246
	for (i = 0; i < COMPUTE_MAX; i++)
247
		if (!strcmp(cstr, compute_names[i])) {
248
			*cp = i;
249
			return setup_compute_opt(option);
250 251 252
		}

	pr_err("Failed: '%s' is not computation method "
253
	       "(use 'delta','ratio' or 'wdiff')\n", str);
254 255 256
	return -EINVAL;
}

257
static double period_percent(struct hist_entry *he, u64 period)
258
{
259 260
	u64 total = hists__total_period(he->hists);

261 262 263
	return (period * 100.0) / total;
}

264
static double compute_delta(struct hist_entry *he, struct hist_entry *pair)
265
{
266 267
	double old_percent = period_percent(he, he->stat.period);
	double new_percent = period_percent(pair, pair->stat.period);
268

269 270 271
	pair->diff.period_ratio_delta = new_percent - old_percent;
	pair->diff.computed = true;
	return pair->diff.period_ratio_delta;
272 273
}

274
static double compute_ratio(struct hist_entry *he, struct hist_entry *pair)
275
{
276 277
	double old_period = he->stat.period ?: 1;
	double new_period = pair->stat.period;
278

279 280 281
	pair->diff.computed = true;
	pair->diff.period_ratio = new_period / old_period;
	return pair->diff.period_ratio;
282 283
}

284
static s64 compute_wdiff(struct hist_entry *he, struct hist_entry *pair)
285
{
286 287
	u64 old_period = he->stat.period;
	u64 new_period = pair->stat.period;
288

289 290 291
	pair->diff.computed = true;
	pair->diff.wdiff = new_period * compute_wdiff_w2 -
			   old_period * compute_wdiff_w1;
292

293
	return pair->diff.wdiff;
294 295
}

296 297
static int formula_delta(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
298
{
299 300 301 302 303 304 305
	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;
	}
306 307 308
	return scnprintf(buf, size,
			 "(%" PRIu64 " * 100 / %" PRIu64 ") - "
			 "(%" PRIu64 " * 100 / %" PRIu64 ")",
309 310
			 pair->stat.period, pair_total,
			 he->stat.period, he_total);
311 312
}

313 314
static int formula_ratio(struct hist_entry *he, struct hist_entry *pair,
			 char *buf, size_t size)
315
{
316 317
	double old_period = he->stat.period;
	double new_period = pair->stat.period;
318 319 320 321

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

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

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

333 334
static int formula_fprintf(struct hist_entry *he, struct hist_entry *pair,
			   char *buf, size_t size)
335 336 337
{
	switch (compute) {
	case COMPUTE_DELTA:
338
	case COMPUTE_DELTA_ABS:
339
		return formula_delta(he, pair, buf, size);
340
	case COMPUTE_RATIO:
341
		return formula_ratio(he, pair, buf, size);
342
	case COMPUTE_WEIGHTED_DIFF:
343
		return formula_wdiff(he, pair, buf, size);
344 345 346 347 348 349 350
	default:
		BUG_ON(1);
	}

	return -1;
}

351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375
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,
};

376
static int diff__process_sample_event(struct perf_tool *tool,
377
				      union perf_event *event,
378
				      struct perf_sample *sample,
379
				      struct perf_evsel *evsel,
380
				      struct machine *machine)
381
{
382
	struct perf_diff *pdiff = container_of(tool, struct perf_diff, tool);
383
	struct addr_location al;
384
	struct hists *hists = evsel__hists(evsel);
385
	int ret = -1;
386

387 388 389 390 391
	if (perf_time__ranges_skip_sample(pdiff->ptime_range, pdiff->range_num,
					  sample->time)) {
		return 0;
	}

392
	if (machine__resolve(machine, &al, sample) < 0) {
393 394 395 396 397
		pr_warning("problem processing %d event, skipping it.\n",
			   event->header.type);
		return -1;
	}

J
Jin Yao 已提交
398 399 400 401 402
	if (cpu_list && !test_bit(sample->cpu, cpu_bitmap)) {
		ret = 0;
		goto out_put;
	}

403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418
	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;
		}

		hist__account_cycles(sample->branch_stack, &al, sample, false);
419 420
	}

421 422 423 424 425 426
	/*
	 * 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.
	 */
427
	hists->stats.total_period += sample->period;
428
	if (!al.filtered)
429
		hists->stats.total_non_filtered_period += sample->period;
430 431 432 433
	ret = 0;
out_put:
	addr_location__put(&al);
	return ret;
434 435
}

436 437 438 439 440 441 442 443 444 445 446 447 448
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,
	},
449 450
};

451 452 453 454 455
static struct perf_evsel *evsel_match(struct perf_evsel *evsel,
				      struct perf_evlist *evlist)
{
	struct perf_evsel *e;

456
	evlist__for_each_entry(evlist, e) {
457 458
		if (perf_evsel__match2(evsel, e))
			return e;
459
	}
460 461 462 463

	return NULL;
}

464
static void perf_evlist__collapse_resort(struct perf_evlist *evlist)
465 466 467
{
	struct perf_evsel *evsel;

468
	evlist__for_each_entry(evlist, evsel) {
469
		struct hists *hists = evsel__hists(evsel);
470

471
		hists__collapse_resort(hists, NULL);
472 473 474
	}
}

475 476 477 478 479 480 481 482 483
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;
}

484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500
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)
{
501
	struct data__file *d = fmt_to_data_file(&dfmt->fmt);
502 503 504 505

	return get_pair_data(he, d);
}

506 507
static void hists__baseline_only(struct hists *hists)
{
D
Davidlohr Bueso 已提交
508
	struct rb_root_cached *root;
509 510
	struct rb_node *next;

511
	if (hists__has(hists, need_collapse))
512 513 514
		root = &hists->entries_collapsed;
	else
		root = hists->entries_in;
515

D
Davidlohr Bueso 已提交
516
	next = rb_first_cached(root);
517
	while (next != NULL) {
518
		struct hist_entry *he = rb_entry(next, struct hist_entry, rb_node_in);
519

520
		next = rb_next(&he->rb_node_in);
521
		if (!hist_entry__next_pair(he)) {
D
Davidlohr Bueso 已提交
522
			rb_erase_cached(&he->rb_node_in, root);
523
			hist_entry__delete(he);
524 525 526 527
		}
	}
}

528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 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 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648
static int64_t block_cmp(struct perf_hpp_fmt *fmt __maybe_unused,
			 struct hist_entry *left, struct hist_entry *right)
{
	struct block_info *bi_l = left->block_info;
	struct block_info *bi_r = right->block_info;
	int cmp;

	if (!bi_l->sym || !bi_r->sym) {
		if (!bi_l->sym && !bi_r->sym)
			return 0;
		else if (!bi_l->sym)
			return -1;
		else
			return 1;
	}

	if (bi_l->sym == bi_r->sym) {
		if (bi_l->start == bi_r->start) {
			if (bi_l->end == bi_r->end)
				return 0;
			else
				return (int64_t)(bi_r->end - bi_l->end);
		} else
			return (int64_t)(bi_r->start - bi_l->start);
	} else {
		cmp = strcmp(bi_l->sym->name, bi_r->sym->name);
		return cmp;
	}

	if (bi_l->sym->start != bi_r->sym->start)
		return (int64_t)(bi_r->sym->start - bi_l->sym->start);

	return (int64_t)(bi_r->sym->end - bi_l->sym->end);
}

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;

	l = labs(left->diff.cycles);
	r = labs(right->diff.cycles);
	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);
	bh->block_fmt.cmp = block_cmp;
	bh->block_fmt.sort = block_sort;
	perf_hpp_list__register_sort_field(&bh->block_list,
					   &bh->block_fmt);
	bh->valid = true;
}

static void init_block_info(struct block_info *bi, struct symbol *sym,
			    struct cyc_hist *ch, int offset)
{
	bi->sym = sym;
	bi->start = ch->start;
	bi->end = offset;
	bi->cycles = ch->cycles;
	bi->cycles_aggr = ch->cycles_aggr;
	bi->num = ch->num;
	bi->num_aggr = ch->num_aggr;
}

static int process_block_per_sym(struct hist_entry *he)
{
	struct annotation *notes;
	struct cyc_hist *ch;
	struct block_hist *bh;

	if (!he->ms.map || !he->ms.sym)
		return 0;

	notes = symbol__annotation(he->ms.sym);
	if (!notes || !notes->src || !notes->src->cycles_hist)
		return 0;

	bh = container_of(he, struct block_hist, he);
	init_block_hist(bh);

	ch = notes->src->cycles_hist;
	for (unsigned int i = 0; i < symbol__size(he->ms.sym); i++) {
		if (ch[i].num_aggr) {
			struct block_info *bi;
			struct hist_entry *he_block;

			bi = block_info__new();
			if (!bi)
				return -1;

			init_block_info(bi, he->ms.sym, &ch[i], i);
			he_block = hists__add_entry_block(&bh->block_hists,
							  &dummy_al, bi);
			if (!he_block) {
				block_info__put(bi);
				return -1;
			}
		}
	}

	return 0;
}

649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724
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;
}

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;
	}
}

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);
		}
	}
}

static int filter_cb(struct hist_entry *he, void *arg __maybe_unused)
{
	/* Skip the calculation of column length in output_resort */
	he->filtered = true;
	return 0;
}

725 726
static void hists__precompute(struct hists *hists)
{
D
Davidlohr Bueso 已提交
727
	struct rb_root_cached *root;
728 729
	struct rb_node *next;

730
	if (hists__has(hists, need_collapse))
731 732 733
		root = &hists->entries_collapsed;
	else
		root = hists->entries_in;
734

D
Davidlohr Bueso 已提交
735
	next = rb_first_cached(root);
736
	while (next != NULL) {
737
		struct block_hist *bh, *pair_bh;
738
		struct hist_entry *he, *pair;
739 740
		struct data__file *d;
		int i;
741

742
		he   = rb_entry(next, struct hist_entry, rb_node_in);
743
		next = rb_next(&he->rb_node_in);
744

745 746 747
		if (compute == COMPUTE_CYCLES)
			process_block_per_sym(he);

748 749 750 751 752 753 754
		data__for_each_file_new(i, d) {
			pair = get_pair_data(he, d);
			if (!pair)
				continue;

			switch (compute) {
			case COMPUTE_DELTA:
755
			case COMPUTE_DELTA_ABS:
756 757 758 759 760 761 762 763
				compute_delta(he, pair);
				break;
			case COMPUTE_RATIO:
				compute_ratio(he, pair);
				break;
			case COMPUTE_WEIGHTED_DIFF:
				compute_wdiff(he, pair);
				break;
764 765
			case COMPUTE_CYCLES:
				process_block_per_sym(pair);
766 767 768 769 770 771 772 773 774 775
				bh = container_of(he, struct block_hist, he);
				pair_bh = container_of(pair, struct block_hist,
						       he);

				if (bh->valid && pair_bh->valid) {
					block_hists_match(&bh->block_hists,
							  &pair_bh->block_hists);
					hists__output_resort_cb(&pair_bh->block_hists,
								NULL, filter_cb);
				}
776
				break;
777 778 779
			default:
				BUG_ON(1);
			}
780 781 782 783 784 785 786 787 788 789 790 791 792 793 794
		}
	}
}

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
795
__hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
796 797 798 799 800 801 802 803 804 805
			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);
	}
806 807 808 809 810 811 812
	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);
	}
813 814 815 816 817 818 819
	case COMPUTE_RATIO:
	{
		double l = left->diff.period_ratio;
		double r = right->diff.period_ratio;

		return cmp_doubles(l, r);
	}
820 821 822 823 824 825 826
	case COMPUTE_WEIGHTED_DIFF:
	{
		s64 l = left->diff.wdiff;
		s64 r = right->diff.wdiff;

		return r - l;
	}
827 828 829 830 831 832 833
	default:
		BUG_ON(1);
	}

	return 0;
}

834 835
static int64_t
hist_entry__cmp_compute(struct hist_entry *left, struct hist_entry *right,
836
			int c, int sort_idx)
837 838 839 840 841 842 843 844 845 846 847
{
	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;

848 849
	p_left  = get_pair_data(left,  &data__files[sort_idx]);
	p_right = get_pair_data(right, &data__files[sort_idx]);
850 851 852 853 854 855 856 857 858 859 860 861 862 863

	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);
}

864 865 866 867 868 869 870 871 872 873 874 875 876 877 878
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;

879
	if (c != COMPUTE_DELTA && c != COMPUTE_DELTA_ABS) {
880 881 882 883 884 885 886 887 888 889 890 891 892 893 894
		/*
		 * 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);
}

895
static int64_t
896 897
hist_entry__cmp_nop(struct perf_hpp_fmt *fmt __maybe_unused,
		    struct hist_entry *left __maybe_unused,
898 899 900 901 902 903
		    struct hist_entry *right __maybe_unused)
{
	return 0;
}

static int64_t
904 905
hist_entry__cmp_baseline(struct perf_hpp_fmt *fmt __maybe_unused,
			 struct hist_entry *left, struct hist_entry *right)
906 907 908 909 910 911 912
{
	if (left->stat.period == right->stat.period)
		return 0;
	return left->stat.period > right->stat.period ? 1 : -1;
}

static int64_t
913
hist_entry__cmp_delta(struct perf_hpp_fmt *fmt,
914
		      struct hist_entry *left, struct hist_entry *right)
915
{
916 917 918
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_DELTA, d->idx);
919 920
}

921 922 923 924 925 926 927 928 929
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);
}

930
static int64_t
931
hist_entry__cmp_ratio(struct perf_hpp_fmt *fmt,
932
		      struct hist_entry *left, struct hist_entry *right)
933
{
934 935 936
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_RATIO, d->idx);
937 938 939
}

static int64_t
940
hist_entry__cmp_wdiff(struct perf_hpp_fmt *fmt,
941
		      struct hist_entry *left, struct hist_entry *right)
942
{
943 944 945
	struct data__file *d = fmt_to_data_file(fmt);

	return hist_entry__cmp_compute(right, left, COMPUTE_WEIGHTED_DIFF, d->idx);
946 947
}

948 949 950 951 952 953 954 955
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);
}

956 957 958 959 960 961 962 963
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);
}

964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979
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);
}

980
static void hists__process(struct hists *hists)
981 982
{
	if (show_baseline_only)
983
		hists__baseline_only(hists);
984

985
	hists__precompute(hists);
986
	hists__output_resort(hists, NULL);
987

988 989 990
	if (compute == COMPUTE_CYCLES)
		symbol_conf.report_block = true;

N
Namhyung Kim 已提交
991
	hists__fprintf(hists, !quiet, 0, 0, 0, stdout,
992
		       !symbol_conf.use_callchain);
993 994
}

995 996 997 998 999 1000 1001 1002 1003
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 已提交
1004
			d->idx, d->data.path,
1005 1006 1007 1008 1009
			!d->idx ? "(Baseline)" : "");

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

1010
static void data_process(void)
1011
{
1012 1013
	struct perf_evlist *evlist_base = data__files[0].session->evlist;
	struct perf_evsel *evsel_base;
1014
	bool first = true;
1015

1016
	evlist__for_each_entry(evlist_base, evsel_base) {
1017
		struct hists *hists_base = evsel__hists(evsel_base);
1018 1019
		struct data__file *d;
		int i;
1020

1021 1022 1023
		data__for_each_file_new(i, d) {
			struct perf_evlist *evlist = d->session->evlist;
			struct perf_evsel *evsel;
1024
			struct hists *hists;
1025 1026 1027 1028 1029

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

1030 1031
			hists = evsel__hists(evsel);
			d->hists = hists;
1032

1033
			hists__match(hists_base, hists);
1034 1035

			if (!show_baseline_only)
1036
				hists__link(hists_base, hists);
1037
		}
1038

N
Namhyung Kim 已提交
1039 1040 1041 1042
		if (!quiet) {
			fprintf(stdout, "%s# Event '%s'\n#\n", first ? "" : "\n",
				perf_evsel__name(evsel_base));
		}
1043

1044
		first = false;
1045

N
Namhyung Kim 已提交
1046
		if (verbose > 0 || ((data__files_cnt > 2) && !quiet))
1047 1048
			data__fprintf();

1049 1050 1051
		/* Don't sort callchain for perf diff */
		perf_evsel__reset_sample_bit(evsel_base, CALLCHAIN);

1052
		hists__process(hists_base);
1053 1054
	}
}
1055

1056 1057 1058 1059 1060 1061 1062
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];

1063
		zfree(&fmt->header);
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 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143
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;
}

1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
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);
		if (!d->session) {
			pr_err("Failed to open %s\n", d->data.path);
			return -1;
		}

		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;
}

1169 1170 1171
static int __cmd_diff(void)
{
	struct data__file *d;
1172 1173 1174 1175 1176 1177 1178 1179 1180
	int ret, i;
	char *abstime_ostr, *abstime_tmp;

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

	abstime_tmp = abstime_ostr;
	ret = -EINVAL;
1181 1182

	data__for_each_file(i, d) {
1183
		d->session = perf_session__new(&d->data, false, &pdiff.tool);
1184
		if (!d->session) {
J
Jiri Olsa 已提交
1185
			pr_err("Failed to open %s\n", d->data.path);
1186
			ret = -1;
1187 1188
			goto out_delete;
		}
1189

1190 1191 1192 1193 1194 1195
		if (pdiff.time_str) {
			ret = parse_time_str(d, abstime_ostr, &abstime_tmp);
			if (ret < 0)
				goto out_delete;
		}

J
Jin Yao 已提交
1196 1197 1198 1199 1200 1201 1202
		if (cpu_list) {
			ret = perf_session__cpu_bitmap(d->session, cpu_list,
						       cpu_bitmap);
			if (ret < 0)
				goto out_delete;
		}

1203
		ret = perf_session__process_events(d->session);
1204
		if (ret) {
J
Jiri Olsa 已提交
1205
			pr_err("Failed to process %s\n", d->data.path);
1206 1207
			goto out_delete;
		}
1208

1209
		perf_evlist__collapse_resort(d->session->evlist);
1210 1211 1212

		if (pdiff.ptime_range)
			zfree(&pdiff.ptime_range);
1213 1214 1215
	}

	data_process();
1216

1217 1218
 out_delete:
	data__for_each_file(i, d) {
1219
		perf_session__delete(d->session);
1220
		data__free(d);
1221
	}
1222

1223
	free(data__files);
1224 1225 1226 1227 1228 1229 1230

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

	if (abstime_ostr)
		free(abstime_ostr);

1231 1232 1233
	return ret;
}

1234
static const char * const diff_usage[] = {
1235
	"perf diff [<options>] [old_file] [new_file]",
1236
	NULL,
1237 1238 1239
};

static const struct option options[] = {
1240
	OPT_INCR('v', "verbose", &verbose,
1241
		    "be more verbose (show symbol address, etc)"),
N
Namhyung Kim 已提交
1242
	OPT_BOOLEAN('q', "quiet", &quiet, "Do not show any message"),
1243 1244
	OPT_BOOLEAN('b', "baseline-only", &show_baseline_only,
		    "Show only items with match in baseline"),
1245
	OPT_CALLBACK('c', "compute", &compute,
1246
		     "delta,delta-abs,ratio,wdiff:w1,w2 (default delta-abs),cycles",
1247 1248
		     "Entries differential computation selection",
		     setup_compute),
1249 1250
	OPT_BOOLEAN('p', "period", &show_period,
		    "Show period values."),
1251 1252
	OPT_BOOLEAN('F', "formula", &show_formula,
		    "Show formula."),
1253 1254 1255
	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 已提交
1256 1257
	OPT_STRING(0, "kallsyms", &symbol_conf.kallsyms_name,
		   "file", "kallsyms pathname"),
1258 1259
	OPT_BOOLEAN('m', "modules", &symbol_conf.use_modules,
		    "load module symbols - WARNING: use only with -k and LIVE kernel"),
1260 1261 1262 1263 1264 1265
	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"),
1266
	OPT_STRING('s', "sort", &sort_order, "key[,key2...]",
1267 1268
		   "sort by key(s): pid, comm, dso, symbol, parent, cpu, srcline, ..."
		   " Please refer the man page for the complete list."),
1269
	OPT_STRING_NOEMPTY('t', "field-separator", &symbol_conf.field_sep, "separator",
1270 1271
		   "separator for columns, no spaces will be added between "
		   "columns '.' is reserved."),
1272 1273 1274
	OPT_CALLBACK(0, "symfs", NULL, "directory",
		     "Look for files with symbols relative to this directory",
		     symbol__config_symfs),
1275
	OPT_UINTEGER('o', "order", &sort_compute, "Specify compute sorting."),
1276 1277
	OPT_CALLBACK(0, "percentage", NULL, "relative|absolute",
		     "How to display percentage of filtered entries", parse_filter_percentage),
1278 1279
	OPT_STRING(0, "time", &pdiff.time_str, "str",
		   "Time span (time percent or absolute timestamp)"),
J
Jin Yao 已提交
1280
	OPT_STRING(0, "cpu", &cpu_list, "cpu", "list of cpus to profile"),
1281 1282 1283 1284
	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"),
1285 1286 1287
	OPT_END()
};

1288
static double baseline_percent(struct hist_entry *he)
1289
{
1290 1291 1292
	u64 total = hists__total_period(he->hists);

	return 100.0 * he->stat.period / total;
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
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;
}

1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366
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);
}

1367 1368 1369 1370 1371 1372 1373 1374
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;
1375
	s64 wdiff;
1376 1377
	char pfmt[20] = " ";

1378 1379 1380 1381 1382 1383 1384 1385 1386
	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;
		}

1387
		goto no_print;
1388
	}
1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399

	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);
1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410
	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);
1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422
	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);
1423 1424
	case COMPUTE_CYCLES:
		return cycles_printf(he, pair, hpp, dfmt->header_width);
1425 1426 1427 1428
	default:
		BUG_ON(1);
	}
dummy_print:
1429 1430 1431
	return scnprintf(hpp->buf, hpp->size, "%*s",
			dfmt->header_width, "N/A");
no_print:
1432 1433 1434 1435 1436 1437 1438 1439 1440 1441
	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);
}

1442 1443 1444 1445 1446 1447
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);
}

1448 1449 1450 1451 1452 1453
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);
}

1454 1455 1456 1457 1458 1459
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);
}

1460 1461 1462 1463 1464 1465
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);
1466
		break;
1467 1468

	default:
1469
		break;
1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482
	}
}

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:
1483
	case PERF_HPP_DIFF__DELTA_ABS:
1484 1485 1486
		if (pair->diff.computed)
			diff = pair->diff.period_ratio_delta;
		else
1487
			diff = compute_delta(he, pair);
1488

1489
		scnprintf(buf, size, "%+4.2F%%", diff);
1490 1491 1492 1493
		break;

	case PERF_HPP_DIFF__RATIO:
		/* No point for ratio number if we are dummy.. */
1494 1495
		if (he->dummy) {
			scnprintf(buf, size, "N/A");
1496
			break;
1497
		}
1498 1499 1500 1501

		if (pair->diff.computed)
			ratio = pair->diff.period_ratio;
		else
1502
			ratio = compute_ratio(he, pair);
1503 1504 1505 1506 1507 1508 1509

		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.. */
1510 1511
		if (he->dummy) {
			scnprintf(buf, size, "N/A");
1512
			break;
1513
		}
1514 1515 1516 1517

		if (pair->diff.computed)
			wdiff = pair->diff.wdiff;
		else
1518
			wdiff = compute_wdiff(he, pair);
1519 1520 1521 1522 1523 1524

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

	case PERF_HPP_DIFF__FORMULA:
1525
		formula_fprintf(he, pair, buf, size);
1526
		break;
1527 1528 1529 1530 1531

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

1532 1533 1534
	default:
		BUG_ON(1);
	};
1535 1536 1537
}

static void
1538 1539
__hpp__entry_global(struct hist_entry *he, struct diff_hpp_fmt *dfmt,
		    char *buf, size_t size)
1540
{
1541
	struct hist_entry *pair = get_pair_fmt(he, dfmt);
1542
	int idx = dfmt->idx;
1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561

	/* 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] = " ";

1562
	__hpp__entry_global(he, dfmt, buf, MAX_COL_WIDTH);
1563 1564 1565 1566 1567 1568 1569 1570

	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);
}

1571
static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,
1572
		       struct hists *hists __maybe_unused,
1573 1574
		       int line __maybe_unused,
		       int *span __maybe_unused)
1575 1576 1577 1578 1579 1580 1581 1582 1583
{
	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,
1584
		      struct perf_hpp *hpp __maybe_unused,
1585
		      struct hists *hists __maybe_unused)
1586 1587 1588 1589 1590 1591 1592 1593
{
	struct diff_hpp_fmt *dfmt =
		container_of(fmt, struct diff_hpp_fmt, fmt);

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

1594
static void init_header(struct data__file *d, struct diff_hpp_fmt *dfmt)
1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608
{
#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);

1609 1610 1611
	if (data__files_cnt > 2)
		scnprintf(buf, MAX_HEADER_NAME, "%s/%d", header, d->idx);

1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625
#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
}

1626
static void data__hpp_register(struct data__file *d, int idx)
1627
{
1628 1629 1630 1631 1632 1633 1634 1635
	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;
1636 1637
	fmt->cmp    = hist_entry__cmp_nop;
	fmt->collapse = hist_entry__cmp_nop;
1638 1639

	/* TODO more colors */
1640 1641
	switch (idx) {
	case PERF_HPP_DIFF__BASELINE:
1642
		fmt->color = hpp__color_baseline;
1643
		fmt->sort  = hist_entry__cmp_baseline;
1644 1645 1646
		break;
	case PERF_HPP_DIFF__DELTA:
		fmt->color = hpp__color_delta;
1647
		fmt->sort  = hist_entry__cmp_delta;
1648
		break;
1649 1650
	case PERF_HPP_DIFF__RATIO:
		fmt->color = hpp__color_ratio;
1651
		fmt->sort  = hist_entry__cmp_ratio;
1652
		break;
1653 1654
	case PERF_HPP_DIFF__WEIGHTED_DIFF:
		fmt->color = hpp__color_wdiff;
1655
		fmt->sort  = hist_entry__cmp_wdiff;
1656
		break;
1657 1658 1659 1660
	case PERF_HPP_DIFF__DELTA_ABS:
		fmt->color = hpp__color_delta;
		fmt->sort  = hist_entry__cmp_delta_abs;
		break;
1661 1662 1663 1664
	case PERF_HPP_DIFF__CYCLES:
		fmt->color = hpp__color_cycles;
		fmt->sort  = hist_entry__cmp_nop;
		break;
1665
	default:
1666
		fmt->sort  = hist_entry__cmp_nop;
1667 1668
		break;
	}
1669

1670
	init_header(d, dfmt);
1671
	perf_hpp__column_register(fmt);
1672
	perf_hpp__register_sort_field(fmt);
1673 1674
}

1675
static int ui_init(void)
1676
{
1677
	struct data__file *d;
1678
	struct perf_hpp_fmt *fmt;
1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692
	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
		 */
		data__hpp_register(d, i ? compute_2_hpp[compute] :
					  PERF_HPP_DIFF__BASELINE);
1693

1694 1695 1696 1697 1698 1699 1700 1701 1702
		/*
		 * 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);
1703

1704 1705 1706
		if (show_period)
			data__hpp_register(d, i ? PERF_HPP_DIFF__PERIOD :
						  PERF_HPP_DIFF__PERIOD_BASELINE);
1707
	}
1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741

	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;
1742 1743 1744
	case COMPUTE_DELTA_ABS:
		fmt->sort = hist_entry__cmp_delta_abs_idx;
		break;
1745 1746 1747 1748 1749 1750 1751
	case COMPUTE_CYCLES:
		/*
		 * Should set since 'fmt->sort' is called without
		 * checking valid during sorting
		 */
		fmt->sort = hist_entry__cmp_nop;
		break;
1752 1753 1754 1755
	default:
		BUG_ON(1);
	}

1756
	perf_hpp__prepend_sort_field(fmt);
1757
	return 0;
1758 1759
}

1760
static int data_init(int argc, const char **argv)
1761
{
1762 1763 1764 1765 1766
	struct data__file *d;
	static const char *defaults[] = {
		"perf.data.old",
		"perf.data",
	};
1767
	bool use_default = true;
1768 1769 1770 1771
	int i;

	data__files_cnt = 2;

1772
	if (argc) {
1773
		if (argc == 1)
1774
			defaults[1] = argv[0];
1775 1776 1777 1778
		else {
			data__files_cnt = argc;
			use_default = false;
		}
1779
	} else if (perf_guest) {
1780 1781
		defaults[0] = "perf.data.host";
		defaults[1] = "perf.data.guest";
1782 1783
	}

1784 1785 1786 1787 1788
	if (sort_compute >= (unsigned int) data__files_cnt) {
		pr_err("Order option out of limit.\n");
		return -EINVAL;
	}

1789 1790 1791 1792 1793
	data__files = zalloc(sizeof(*data__files) * data__files_cnt);
	if (!data__files)
		return -ENOMEM;

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

J
Jiri Olsa 已提交
1796 1797 1798
		data->path  = use_default ? defaults[i] : argv[i];
		data->mode  = PERF_DATA_MODE_READ,
		data->force = force,
1799

1800 1801 1802 1803 1804 1805
		d->idx  = i;
	}

	return 0;
}

1806 1807 1808 1809
static int diff__config(const char *var, const char *value,
			void *cb __maybe_unused)
{
	if (!strcmp(var, "diff.order")) {
1810 1811 1812 1813
		int ret;
		if (perf_config_int(&ret, var, value) < 0)
			return -1;
		sort_compute = ret;
1814 1815
		return 0;
	}
1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829
	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;
		}
	}
1830 1831 1832 1833

	return 0;
}

1834
int cmd_diff(int argc, const char **argv)
1835
{
1836 1837 1838 1839 1840
	int ret = hists__init();

	if (ret < 0)
		return ret;

1841 1842
	perf_config(diff__config, NULL);

1843 1844
	argc = parse_options(argc, argv, options, diff_usage, 0);

N
Namhyung Kim 已提交
1845 1846 1847
	if (quiet)
		perf_quiet_option();

1848 1849
	symbol__annotation_init();

1850
	if (symbol__init(NULL) < 0)
1851 1852
		return -1;

1853 1854 1855
	if (data_init(argc, argv) < 0)
		return -1;

1856 1857 1858
	if (check_file_brstack() < 0)
		return -1;

1859 1860 1861
	if (compute == COMPUTE_CYCLES && !pdiff.has_br_stack)
		return -1;

1862 1863
	if (ui_init() < 0)
		return -1;
1864

1865 1866
	sort__mode = SORT_MODE__DIFF;

1867
	if (setup_sorting(NULL) < 0)
1868 1869
		usage_with_options(diff_usage, options);

1870
	setup_pager();
1871

1872
	sort__setup_elide(NULL);
1873

1874 1875
	return __cmd_diff();
}