Commit 02da693f authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

perf/x86/intel: Check PEBS dyn_constraints 



Handle the interaction between ("perf/x86/intel: Update dyn_constraint
base on PEBS event precise level") and ("perf/x86/intel: Add a check
for dynamic constraints").

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
parent bd24f9be

arch/x86/events/intel/core.c

+12 −0
Original line number Diff line number Diff line
@@ -5425,6 +5425,8 @@ enum dyn_constr_type { 
	DYN_CONSTR_BR_CNTR,

	DYN_CONSTR_ACR_CNTR,

	DYN_CONSTR_ACR_CAUSE,

	DYN_CONSTR_PEBS,

	DYN_CONSTR_PDIST,



	DYN_CONSTR_MAX,

};
@@ -5434,6 +5436,8 @@ static const char * const dyn_constr_type_name[] = { 
	[DYN_CONSTR_BR_CNTR] = "a branch counter logging event",

	[DYN_CONSTR_ACR_CNTR] = "an auto-counter reload event",

	[DYN_CONSTR_ACR_CAUSE] = "an auto-counter reload cause event",

	[DYN_CONSTR_PEBS] = "a PEBS event",

	[DYN_CONSTR_PDIST] = "a PEBS PDIST event",

};



static void __intel_pmu_check_dyn_constr(struct event_constraint *constr,
@@ -5538,6 +5542,14 @@ static void intel_pmu_check_dyn_constr(struct pmu *pmu, 
				continue;

			mask = hybrid(pmu, acr_cause_mask64) & GENMASK_ULL(INTEL_PMC_MAX_GENERIC - 1, 0);

			break;

		case DYN_CONSTR_PEBS:

			if (x86_pmu.arch_pebs)

				mask = hybrid(pmu, arch_pebs_cap).counters;

			break;

		case DYN_CONSTR_PDIST:

			if (x86_pmu.arch_pebs)

				mask = hybrid(pmu, arch_pebs_cap).pdists;

			break;

		default:

			pr_warn("Unsupported dynamic constraint type %d\n", i);

		}