Commit 7b100989 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Remove __evlist__add_default 



__evlist__add_default adds a cycles event to a typically empty evlist
and was extended for hybrid with evlist__add_default_hybrid, as more
than 1 PMU was necessary. Rather than have dedicated logic for the
cycles event, this change switches to parsing 'cycles:P' which will
handle wildcarding the PMUs appropriately for hybrid.

Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kang Minchul <tegongkang@gmail.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230527072210.2900565-14-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b4388dfa

tools/perf/arch/x86/util/evsel.c

+0 −20
Original line number Diff line number Diff line
@@ -16,26 +16,6 @@ void arch_evsel__set_sample_weight(struct evsel *evsel) 
	evsel__set_sample_bit(evsel, WEIGHT_STRUCT);

}



void arch_evsel__fixup_new_cycles(struct perf_event_attr *attr)

{

	struct perf_env env = { .total_mem = 0, } ;



	if (!perf_env__cpuid(&env))

		return;



	/*

	 * On AMD, precise cycles event sampling internally uses IBS pmu.

	 * But IBS does not have filtering capabilities and perf by default

	 * sets exclude_guest = 1. This makes IBS pmu event init fail and

	 * thus perf ends up doing non-precise sampling. Avoid it by clearing

	 * exclude_guest.

	 */

	if (env.cpuid && strstarts(env.cpuid, "AuthenticAMD"))

		attr->exclude_guest = 0;



	free(env.cpuid);

}



/* Check whether the evsel's PMU supports the perf metrics */

bool evsel__sys_has_perf_metrics(const struct evsel *evsel)

{

tools/perf/builtin-record.c

+3 −10
Original line number Diff line number Diff line
@@ -4161,19 +4161,12 @@ int cmd_record(int argc, const char **argv) 
		record.opts.tail_synthesize = true;



	if (rec->evlist->core.nr_entries == 0) {

		if (perf_pmu__has_hybrid()) {

			err = evlist__add_default_hybrid(rec->evlist,

							 !record.opts.no_samples);

		} else {

			err = __evlist__add_default(rec->evlist,

						    !record.opts.no_samples);

		}

		bool can_profile_kernel = perf_event_paranoid_check(1);



		if (err < 0) {

			pr_err("Not enough memory for event selector list\n");

		err = parse_event(rec->evlist, can_profile_kernel ? "cycles:P" : "cycles:Pu");

		if (err)

			goto out;

	}

	}



	if (rec->opts.target.tid && !rec->opts.no_inherit_set)

		rec->opts.no_inherit = true;

tools/perf/builtin-top.c

+6 −4
Original line number Diff line number Diff line
@@ -1653,9 +1653,11 @@ int cmd_top(int argc, const char **argv) 
	if (annotate_check_args(&top.annotation_opts) < 0)

		goto out_delete_evlist;



	if (!top.evlist->core.nr_entries &&

	    evlist__add_default(top.evlist) < 0) {

		pr_err("Not enough memory for event selector list\n");

	if (!top.evlist->core.nr_entries) {

		bool can_profile_kernel = perf_event_paranoid_check(1);

		int err = parse_event(top.evlist, can_profile_kernel ? "cycles:P" : "cycles:Pu");



		if (err)

			goto out_delete_evlist;

	}

tools/perf/util/evlist-hybrid.c

+0 −25
Original line number Diff line number Diff line
@@ -16,31 +16,6 @@ 
#include <perf/evsel.h>

#include <perf/cpumap.h>



int evlist__add_default_hybrid(struct evlist *evlist, bool precise)

{

	struct evsel *evsel;

	struct perf_pmu *pmu;

	__u64 config;

	struct perf_cpu_map *cpus;



	perf_pmu__for_each_hybrid_pmu(pmu) {

		config = PERF_COUNT_HW_CPU_CYCLES |

			 ((__u64)pmu->type << PERF_PMU_TYPE_SHIFT);

		evsel = evsel__new_cycles(precise, PERF_TYPE_HARDWARE,

					  config);

		if (!evsel)

			return -ENOMEM;



		cpus = perf_cpu_map__get(pmu->cpus);

		evsel->core.cpus = cpus;

		evsel->core.own_cpus = perf_cpu_map__get(cpus);

		evsel->pmu_name = strdup(pmu->name);

		evlist__add(evlist, evsel);

	}



	return 0;

}



bool evlist__has_hybrid(struct evlist *evlist)

{

	struct evsel *evsel;

tools/perf/util/evlist-hybrid.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include "evlist.h"

#include <unistd.h>



int evlist__add_default_hybrid(struct evlist *evlist, bool precise);

bool evlist__has_hybrid(struct evlist *evlist);



#endif /* __PERF_EVLIST_HYBRID_H */