From: Like Xu <likexu@xxxxxxxxxxx>
Move check_emulated_instr() into check_counters() so that full-width
counters could be tested with ease by the same test case.
Signed-off-by: Like Xu <likexu@xxxxxxxxxxx>
Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
---
x86/pmu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/x86/pmu.c b/x86/pmu.c
index 1a3e5a54..308a0ce0 100644
--- a/x86/pmu.c
+++ b/x86/pmu.c
@@ -520,6 +520,9 @@ static void check_emulated_instr(void)
static void check_counters(void)
{
+ if (is_fep_available())
+ check_emulated_instr();
+
check_gp_counters();
check_fixed_counters();
check_rdpmc();
@@ -655,9 +658,6 @@ int main(int ac, char **av)
apic_write(APIC_LVTPC, PC_VECTOR);
- if (is_fep_available())
- check_emulated_instr();
-
check_counters();
if (this_cpu_perf_capabilities() & PMU_CAP_FW_WRITES) {
--
2.38.1.431.g37b22c650d-goog
