Skip to content

Commit 6b19788

Browse files
author
Peter Zijlstra (Intel)
committed
perf/x86/intel/lbr: Add static_branch for LBR INFO flags
Using static_branch to replace the LBR INFO flags to optimize the LBR INFO parsing. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Tested-by: Kan Liang <kan.liang@linux.intel.com> Link: https://lkml.kernel.org/r/1641315077-96661-2-git-send-email-peterz@infradead.org
1 parent 1ac7fd8 commit 6b19788

File tree

1 file changed

+34
-17
lines changed
  • arch/x86/events/intel

1 file changed

+34
-17
lines changed

arch/x86/events/intel/lbr.c

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -893,37 +893,40 @@ void intel_pmu_lbr_read_64(struct cpu_hw_events *cpuc)
893893
cpuc->lbr_stack.hw_idx = tos;
894894
}
895895

896+
static DEFINE_STATIC_KEY_FALSE(x86_lbr_mispred);
897+
static DEFINE_STATIC_KEY_FALSE(x86_lbr_cycles);
898+
static DEFINE_STATIC_KEY_FALSE(x86_lbr_type);
899+
896900
static __always_inline int get_lbr_br_type(u64 info)
897901
{
898-
if (!static_cpu_has(X86_FEATURE_ARCH_LBR) || !x86_pmu.lbr_br_type)
899-
return 0;
902+
int type = 0;
900903

901-
return (info & LBR_INFO_BR_TYPE) >> LBR_INFO_BR_TYPE_OFFSET;
904+
if (static_branch_likely(&x86_lbr_type))
905+
type = (info & LBR_INFO_BR_TYPE) >> LBR_INFO_BR_TYPE_OFFSET;
906+
907+
return type;
902908
}
903909

904910
static __always_inline bool get_lbr_mispred(u64 info)
905911
{
906-
if (static_cpu_has(X86_FEATURE_ARCH_LBR) && !x86_pmu.lbr_mispred)
907-
return 0;
912+
bool mispred = 0;
908913

909-
return !!(info & LBR_INFO_MISPRED);
910-
}
911-
912-
static __always_inline bool get_lbr_predicted(u64 info)
913-
{
914-
if (static_cpu_has(X86_FEATURE_ARCH_LBR) && !x86_pmu.lbr_mispred)
915-
return 0;
914+
if (static_branch_likely(&x86_lbr_mispred))
915+
mispred = !!(info & LBR_INFO_MISPRED);
916916

917-
return !(info & LBR_INFO_MISPRED);
917+
return mispred;
918918
}
919919

920920
static __always_inline u16 get_lbr_cycles(u64 info)
921921
{
922+
u16 cycles = info & LBR_INFO_CYCLES;
923+
922924
if (static_cpu_has(X86_FEATURE_ARCH_LBR) &&
923-
!(x86_pmu.lbr_timed_lbr && info & LBR_INFO_CYC_CNT_VALID))
924-
return 0;
925+
(!static_branch_likely(&x86_lbr_cycles) ||
926+
!(info & LBR_INFO_CYC_CNT_VALID)))
927+
cycles = 0;
925928

926-
return info & LBR_INFO_CYCLES;
929+
return cycles;
927930
}
928931

929932
static void intel_pmu_store_lbr(struct cpu_hw_events *cpuc,
@@ -951,7 +954,7 @@ static void intel_pmu_store_lbr(struct cpu_hw_events *cpuc,
951954
e->from = from;
952955
e->to = to;
953956
e->mispred = get_lbr_mispred(info);
954-
e->predicted = get_lbr_predicted(info);
957+
e->predicted = !e->mispred;
955958
e->in_tx = !!(info & LBR_INFO_IN_TX);
956959
e->abort = !!(info & LBR_INFO_ABORT);
957960
e->cycles = get_lbr_cycles(info);
@@ -1718,6 +1721,14 @@ void intel_pmu_lbr_init(void)
17181721
x86_pmu.lbr_to_cycles = 1;
17191722
break;
17201723
}
1724+
1725+
if (x86_pmu.lbr_has_info) {
1726+
/*
1727+
* Only used in combination with baseline pebs.
1728+
*/
1729+
static_branch_enable(&x86_lbr_mispred);
1730+
static_branch_enable(&x86_lbr_cycles);
1731+
}
17211732
}
17221733

17231734
/*
@@ -1779,6 +1790,12 @@ void __init intel_pmu_arch_lbr_init(void)
17791790
x86_pmu.lbr_br_type = ecx.split.lbr_br_type;
17801791
x86_pmu.lbr_nr = lbr_nr;
17811792

1793+
if (x86_pmu.lbr_mispred)
1794+
static_branch_enable(&x86_lbr_mispred);
1795+
if (x86_pmu.lbr_timed_lbr)
1796+
static_branch_enable(&x86_lbr_cycles);
1797+
if (x86_pmu.lbr_br_type)
1798+
static_branch_enable(&x86_lbr_type);
17821799

17831800
arch_lbr_xsave = is_arch_lbr_xsave_available();
17841801
if (arch_lbr_xsave) {

0 commit comments

Comments
 (0)