Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94403f88 authored Apr 24, 2011 by Ingo Molnar

perf events: Add stalled cycles generic event - PERF_COUNT_HW_STALLED_CYCLES



The new PERF_COUNT_HW_STALLED_CYCLES event tries to approximate
cycles the CPU does nothing useful, because it is stalled on a
cache-miss or some other condition.

Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/n/tip-fue11vymwqsoo5to72jxxjyl@git.kernel.org


Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 7bd5fafe

arch/x86/kernel/cpu/perf_event_intel.c

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1413,6 +1413,9 @@ static __init int intel_pmu_init(void)
	x86_pmu.enable_all = intel_pmu_nhm_enable_all;		x86_pmu.enable_all = intel_pmu_nhm_enable_all;
	x86_pmu.extra_regs = intel_nehalem_extra_regs;		x86_pmu.extra_regs = intel_nehalem_extra_regs;

			/* Install the stalled-cycles event: 0xff: All reasons, 0xa2: Resource stalls */
			intel_perfmon_event_map[PERF_COUNT_HW_STALLED_CYCLES] = 0xffa2;

	if (ebx & 0x40) {		if (ebx & 0x40) {
	/*		/*
	* Erratum AAJ80 detected, we work it around by using		* Erratum AAJ80 detected, we work it around by using

include/linux/perf_event.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -52,6 +52,7 @@ enum perf_hw_id {
	PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 4,		PERF_COUNT_HW_BRANCH_INSTRUCTIONS = 4,
	PERF_COUNT_HW_BRANCH_MISSES = 5,		PERF_COUNT_HW_BRANCH_MISSES = 5,
	PERF_COUNT_HW_BUS_CYCLES = 6,		PERF_COUNT_HW_BUS_CYCLES = 6,
			PERF_COUNT_HW_STALLED_CYCLES = 7,

	PERF_COUNT_HW_MAX, /* non-ABI */		PERF_COUNT_HW_MAX, /* non-ABI */
	};		};

tools/perf/util/parse-events.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,7 @@ static struct event_symbol event_symbols[] = {
	{ CHW(BRANCH_INSTRUCTIONS), "branch-instructions", "branches" },		{ CHW(BRANCH_INSTRUCTIONS), "branch-instructions", "branches" },
	{ CHW(BRANCH_MISSES), "branch-misses", "" },		{ CHW(BRANCH_MISSES), "branch-misses", "" },
	{ CHW(BUS_CYCLES), "bus-cycles", "" },		{ CHW(BUS_CYCLES), "bus-cycles", "" },
			{ CHW(STALLED_CYCLES), "stalled-cycles", "" },

	{ CSW(CPU_CLOCK), "cpu-clock", "" },		{ CSW(CPU_CLOCK), "cpu-clock", "" },
	{ CSW(TASK_CLOCK), "task-clock", "" },		{ CSW(TASK_CLOCK), "task-clock", "" },

tools/perf/util/python.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -798,6 +798,7 @@ static struct {
	{ "COUNT_HW_BRANCH_INSTRUCTIONS", PERF_COUNT_HW_BRANCH_INSTRUCTIONS },		{ "COUNT_HW_BRANCH_INSTRUCTIONS", PERF_COUNT_HW_BRANCH_INSTRUCTIONS },
	{ "COUNT_HW_BRANCH_MISSES", PERF_COUNT_HW_BRANCH_MISSES },		{ "COUNT_HW_BRANCH_MISSES", PERF_COUNT_HW_BRANCH_MISSES },
	{ "COUNT_HW_BUS_CYCLES", PERF_COUNT_HW_BUS_CYCLES },		{ "COUNT_HW_BUS_CYCLES", PERF_COUNT_HW_BUS_CYCLES },
			{ "COUNT_HW_STALLED_CYCLES", PERF_COUNT_HW_STALLED_CYCLES },
	{ "COUNT_HW_CACHE_L1D", PERF_COUNT_HW_CACHE_L1D },		{ "COUNT_HW_CACHE_L1D", PERF_COUNT_HW_CACHE_L1D },
	{ "COUNT_HW_CACHE_L1I", PERF_COUNT_HW_CACHE_L1I },		{ "COUNT_HW_CACHE_L1I", PERF_COUNT_HW_CACHE_L1I },
	{ "COUNT_HW_CACHE_LL", PERF_COUNT_HW_CACHE_LL },		{ "COUNT_HW_CACHE_LL", PERF_COUNT_HW_CACHE_LL },