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

Commit f287d332 authored by Vince Weaver's avatar Vince Weaver Committed by Ingo Molnar
Browse files

perf, x86: Fix incorrect branches event on AMD CPUs 



While doing some performance counter validation tests on some
assembly language programs I noticed that the "branches:u"
count was very wrong on AMD machines.

It looks like the wrong event was selected.

Signed-off-by: default avatarVince Weaver <vweaver1@eecs.utk.edu>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Borislav Petkov <borislav.petkov@amd.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: <stable@kernel.org>
LKML-Reference: <alpine.DEB.2.00.1007011526010.23160@cl320.eecs.utk.edu>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c214909b

arch/x86/kernel/cpu/perf_event_amd.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -102,8 +102,8 @@ static const u64 amd_perfmon_event_map[] = 
  [PERF_COUNT_HW_INSTRUCTIONS]		= 0x00c0,

  [PERF_COUNT_HW_INSTRUCTIONS]		= 0x00c0,

  [PERF_COUNT_HW_CACHE_REFERENCES]	= 0x0080,

  [PERF_COUNT_HW_CACHE_REFERENCES]	= 0x0080,

  [PERF_COUNT_HW_CACHE_MISSES]		= 0x0081,

  [PERF_COUNT_HW_CACHE_MISSES]		= 0x0081,

  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= 0x00c4,

  [PERF_COUNT_HW_BRANCH_INSTRUCTIONS]	= 0x00c2,

  [PERF_COUNT_HW_BRANCH_MISSES]		= 0x00c5,

  [PERF_COUNT_HW_BRANCH_MISSES]		= 0x00c3,

};

};





static u64 amd_pmu_event_map(int hw_event)

static u64 amd_pmu_event_map(int hw_event)