Commit 5fc1bd84 authored by Jiri Olsa's avatar Jiri Olsa Committed by Ingo Molnar
Browse files

perf/x86/rapl: Get attributes from new probe framework 



We no longer need model specific attribute arrays,
because we get all this detected in rapl_events_attrs.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan <kan.liang@linux.intel.com>
Cc: Liang
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Link: https://lkml.kernel.org/r/20190616140358.27799-8-jolsa@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 122f1c51

arch/x86/events/intel/rapl.c

+0 −89
Original line number Diff line number Diff line
@@ -416,87 +416,6 @@ RAPL_EVENT_ATTR_STR(energy-ram.scale, rapl_ram_scale, "2.3283064365386962890 
RAPL_EVENT_ATTR_STR(energy-gpu.scale,     rapl_gpu_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-psys.scale,   rapl_psys_scale, "2.3283064365386962890625e-10");



static struct attribute *rapl_events_srv_attr[] = {

	EVENT_PTR(rapl_cores),

	EVENT_PTR(rapl_pkg),

	EVENT_PTR(rapl_ram),



	EVENT_PTR(rapl_cores_unit),

	EVENT_PTR(rapl_pkg_unit),

	EVENT_PTR(rapl_ram_unit),



	EVENT_PTR(rapl_cores_scale),

	EVENT_PTR(rapl_pkg_scale),

	EVENT_PTR(rapl_ram_scale),

	NULL,

};



static struct attribute *rapl_events_cln_attr[] = {

	EVENT_PTR(rapl_cores),

	EVENT_PTR(rapl_pkg),

	EVENT_PTR(rapl_gpu),



	EVENT_PTR(rapl_cores_unit),

	EVENT_PTR(rapl_pkg_unit),

	EVENT_PTR(rapl_gpu_unit),



	EVENT_PTR(rapl_cores_scale),

	EVENT_PTR(rapl_pkg_scale),

	EVENT_PTR(rapl_gpu_scale),

	NULL,

};



static struct attribute *rapl_events_hsw_attr[] = {

	EVENT_PTR(rapl_cores),

	EVENT_PTR(rapl_pkg),

	EVENT_PTR(rapl_gpu),

	EVENT_PTR(rapl_ram),



	EVENT_PTR(rapl_cores_unit),

	EVENT_PTR(rapl_pkg_unit),

	EVENT_PTR(rapl_gpu_unit),

	EVENT_PTR(rapl_ram_unit),



	EVENT_PTR(rapl_cores_scale),

	EVENT_PTR(rapl_pkg_scale),

	EVENT_PTR(rapl_gpu_scale),

	EVENT_PTR(rapl_ram_scale),

	NULL,

};



static struct attribute *rapl_events_skl_attr[] = {

	EVENT_PTR(rapl_cores),

	EVENT_PTR(rapl_pkg),

	EVENT_PTR(rapl_gpu),

	EVENT_PTR(rapl_ram),

	EVENT_PTR(rapl_psys),



	EVENT_PTR(rapl_cores_unit),

	EVENT_PTR(rapl_pkg_unit),

	EVENT_PTR(rapl_gpu_unit),

	EVENT_PTR(rapl_ram_unit),

	EVENT_PTR(rapl_psys_unit),



	EVENT_PTR(rapl_cores_scale),

	EVENT_PTR(rapl_pkg_scale),

	EVENT_PTR(rapl_gpu_scale),

	EVENT_PTR(rapl_ram_scale),

	EVENT_PTR(rapl_psys_scale),

	NULL,

};



static struct attribute *rapl_events_knl_attr[] = {

	EVENT_PTR(rapl_pkg),

	EVENT_PTR(rapl_ram),



	EVENT_PTR(rapl_pkg_unit),

	EVENT_PTR(rapl_ram_unit),



	EVENT_PTR(rapl_pkg_scale),

	EVENT_PTR(rapl_ram_scale),

	NULL,

};



/*

 * There are no default events, but we need to create

 * "events" group (with empty attrs) before updating
@@ -754,37 +673,30 @@ static int __init init_rapl_pmus(void) 


struct intel_rapl_init_fun {

	bool apply_quirk;

	struct attribute **attrs;

};



static const struct intel_rapl_init_fun snb_rapl_init __initconst = {

	.apply_quirk = false,

	.attrs = rapl_events_cln_attr,

};



static const struct intel_rapl_init_fun hsx_rapl_init __initconst = {

	.apply_quirk = true,

	.attrs = rapl_events_srv_attr,

};



static const struct intel_rapl_init_fun hsw_rapl_init __initconst = {

	.apply_quirk = false,

	.attrs = rapl_events_hsw_attr,

};



static const struct intel_rapl_init_fun snbep_rapl_init __initconst = {

	.apply_quirk = false,

	.attrs = rapl_events_srv_attr,

};



static const struct intel_rapl_init_fun knl_rapl_init __initconst = {

	.apply_quirk = true,

	.attrs = rapl_events_knl_attr,

};



static const struct intel_rapl_init_fun skl_rapl_init __initconst = {

	.apply_quirk = false,

	.attrs = rapl_events_skl_attr,

};



static const struct x86_cpu_id rapl_cpu_match[] __initconst = {
@@ -923,7 +835,6 @@ static int __init rapl_pmu_init(void) 


	rapl_init = (struct intel_rapl_init_fun *)id->driver_data;

	apply_quirk = rapl_init->apply_quirk;

	rapl_pmu_events_group.attrs = rapl_init->attrs;



	ret = rapl_check_hw_unit(apply_quirk);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE