Commit b53a0755 authored by Jin Yao's avatar Jin Yao Committed by Arnaldo Carvalho de Melo
Browse files

perf record: Create two hybrid 'cycles' events by default 



When evlist is empty, for example no '-e' specified in perf record,
one default 'cycles' event is added to evlist.

While on hybrid platform, it needs to create two default 'cycles'
events. One is for cpu_core, the other is for cpu_atom.

This patch actually calls evsel__new_cycles() two times to create
two 'cycles' events.

  # ./perf record -vv -a -- sleep 1
  ...
  ------------------------------------------------------------
  perf_event_attr:
    size                             120
    config                           0x400000000
    { sample_period, sample_freq }   4000
    sample_type                      IP|TID|TIME|ID|CPU|PERIOD
    read_format                      ID
    disabled                         1
    inherit                          1
    freq                             1
    precise_ip                       3
    sample_id_all                    1
    exclude_guest                    1
  ------------------------------------------------------------
  sys_perf_event_open: pid -1  cpu 0  group_fd -1  flags 0x8 = 5
  sys_perf_event_open: pid -1  cpu 1  group_fd -1  flags 0x8 = 6
  sys_perf_event_open: pid -1  cpu 2  group_fd -1  flags 0x8 = 7
  sys_perf_event_open: pid -1  cpu 3  group_fd -1  flags 0x8 = 9
  sys_perf_event_open: pid -1  cpu 4  group_fd -1  flags 0x8 = 10
  sys_perf_event_open: pid -1  cpu 5  group_fd -1  flags 0x8 = 11
  sys_perf_event_open: pid -1  cpu 6  group_fd -1  flags 0x8 = 12
  sys_perf_event_open: pid -1  cpu 7  group_fd -1  flags 0x8 = 13
  sys_perf_event_open: pid -1  cpu 8  group_fd -1  flags 0x8 = 14
  sys_perf_event_open: pid -1  cpu 9  group_fd -1  flags 0x8 = 15
  sys_perf_event_open: pid -1  cpu 10  group_fd -1  flags 0x8 = 16
  sys_perf_event_open: pid -1  cpu 11  group_fd -1  flags 0x8 = 17
  sys_perf_event_open: pid -1  cpu 12  group_fd -1  flags 0x8 = 18
  sys_perf_event_open: pid -1  cpu 13  group_fd -1  flags 0x8 = 19
  sys_perf_event_open: pid -1  cpu 14  group_fd -1  flags 0x8 = 20
  sys_perf_event_open: pid -1  cpu 15  group_fd -1  flags 0x8 = 21
  ------------------------------------------------------------
  perf_event_attr:
    size                             120
    config                           0x800000000
    { sample_period, sample_freq }   4000
    sample_type                      IP|TID|TIME|ID|CPU|PERIOD
    read_format                      ID
    disabled                         1
    inherit                          1
    freq                             1
    precise_ip                       3
    sample_id_all                    1
    exclude_guest                    1
  ------------------------------------------------------------
  sys_perf_event_open: pid -1  cpu 16  group_fd -1  flags 0x8 = 22
  sys_perf_event_open: pid -1  cpu 17  group_fd -1  flags 0x8 = 23
  sys_perf_event_open: pid -1  cpu 18  group_fd -1  flags 0x8 = 24
  sys_perf_event_open: pid -1  cpu 19  group_fd -1  flags 0x8 = 25
  sys_perf_event_open: pid -1  cpu 20  group_fd -1  flags 0x8 = 26
  sys_perf_event_open: pid -1  cpu 21  group_fd -1  flags 0x8 = 27
  sys_perf_event_open: pid -1  cpu 22  group_fd -1  flags 0x8 = 28
  sys_perf_event_open: pid -1  cpu 23  group_fd -1  flags 0x8 = 29
  ------------------------------------------------------------

We have to create evlist-hybrid.c otherwise due to the symbol
dependency the perf test python would be failed.

Signed-off-by: default avatarJin Yao <yao.jin@linux.intel.com>
Reviewed-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20210427070139.25256-14-yao.jin@linux.intel.com


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

tools/perf/builtin-record.c

+15 −4
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 
#include "util/util.h"

#include "util/pfm.h"

#include "util/clockid.h"

#include "util/pmu-hybrid.h"

#include "util/evlist-hybrid.h"

#include "asm/bug.h"

#include "perf.h"
@@ -2790,11 +2792,20 @@ int cmd_record(int argc, const char **argv) 
	if (record.opts.overwrite)

		record.opts.tail_synthesize = true;



	if (rec->evlist->core.nr_entries == 0 &&

	    __evlist__add_default(rec->evlist, !record.opts.no_samples) < 0) {

	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);

		}



		if (err < 0) {

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

			goto out;

		}

	}



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

		rec->opts.no_inherit = true;

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ perf-y += db-export.o 
perf-y += env.o

perf-y += event.o

perf-y += evlist.o

perf-y += evlist-hybrid.o

perf-y += sideband_evlist.o

perf-y += evsel.o

perf-y += evsel_fprintf.o

tools/perf/util/evlist-hybrid.c

0 → 100644
+41 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <errno.h>

#include <inttypes.h>

#include "cpumap.h"

#include "evlist.h"

#include "evsel.h"

#include "../perf.h"

#include "util/pmu-hybrid.h"

#include "util/evlist-hybrid.h"

#include <unistd.h>

#include <stdlib.h>

#include <linux/err.h>

#include <linux/string.h>

#include <perf/evlist.h>

#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;

}

tools/perf/util/evlist-hybrid.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __PERF_EVLIST_HYBRID_H

#define __PERF_EVLIST_HYBRID_H



#include <linux/compiler.h>

#include <linux/kernel.h>

#include "evlist.h"

#include <unistd.h>



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



#endif /* __PERF_EVLIST_HYBRID_H */

tools/perf/util/evlist.c

+4 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "util/string2.h"

#include "util/perf_api_probe.h"

#include "util/evsel_fprintf.h"

#include "util/evlist-hybrid.h"

#include <signal.h>

#include <unistd.h>

#include <sched.h>
@@ -248,8 +249,10 @@ void evlist__set_leader(struct evlist *evlist) 


int __evlist__add_default(struct evlist *evlist, bool precise)

{

	struct evsel *evsel = evsel__new_cycles(precise);

	struct evsel *evsel;



	evsel = evsel__new_cycles(precise, PERF_TYPE_HARDWARE,

				  PERF_COUNT_HW_CPU_CYCLES);

	if (evsel == NULL)

		return -ENOMEM;