mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
db5742b684
It is useful to aggregate counts per die. E.g. Uncore becomes die-scope
on Xeon Cascade Lake-AP.
Introduce a new option "--per-die" to support per-die aggregation.
The global id for each core has been changed to socket + die id + core
id. The global id for each die is socket + die id.
Add die information for per-core aggregation. The output of per-core
aggregation will be changed from "S0-C0" to "S0-D0-C0". Any scripts
which rely on the output format of per-core aggregation probably be
broken.
For 'perf stat record/report', there is no die information when
processing the old perf.data. The per-die result will be the same as
per-socket.
Committer notes:
Renamed 'die' variable to 'die_id' to fix the build in some systems:
CC /tmp/build/perf/builtin-script.o
cc1: warnings being treated as errors
builtin-stat.c: In function 'perf_env__get_die':
builtin-stat.c:963: error: declaration of 'die' shadows a global declaration
util/util.h:19: error: shadowed declaration is here
mv: cannot stat `/tmp/build/perf/.builtin-stat.o.tmp': No such file or directory
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Reviewed-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lkml.kernel.org/n/tip-bsnhx7vgsuu6ei307mw60mbj@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
86 lines
2.4 KiB
C
86 lines
2.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __PERF_CPUMAP_H
|
|
#define __PERF_CPUMAP_H
|
|
|
|
#include <stdio.h>
|
|
#include <stdbool.h>
|
|
#include <linux/refcount.h>
|
|
|
|
#include "perf.h"
|
|
#include "util/debug.h"
|
|
|
|
struct cpu_map {
|
|
refcount_t refcnt;
|
|
int nr;
|
|
int map[];
|
|
};
|
|
|
|
struct cpu_map *cpu_map__new(const char *cpu_list);
|
|
struct cpu_map *cpu_map__empty_new(int nr);
|
|
struct cpu_map *cpu_map__dummy_new(void);
|
|
struct cpu_map *cpu_map__new_data(struct cpu_map_data *data);
|
|
struct cpu_map *cpu_map__read(FILE *file);
|
|
size_t cpu_map__snprint(struct cpu_map *map, char *buf, size_t size);
|
|
size_t cpu_map__snprint_mask(struct cpu_map *map, char *buf, size_t size);
|
|
size_t cpu_map__fprintf(struct cpu_map *map, FILE *fp);
|
|
int cpu_map__get_socket_id(int cpu);
|
|
int cpu_map__get_socket(struct cpu_map *map, int idx, void *data);
|
|
int cpu_map__get_die_id(int cpu);
|
|
int cpu_map__get_die(struct cpu_map *map, int idx, void *data);
|
|
int cpu_map__get_core_id(int cpu);
|
|
int cpu_map__get_core(struct cpu_map *map, int idx, void *data);
|
|
int cpu_map__build_socket_map(struct cpu_map *cpus, struct cpu_map **sockp);
|
|
int cpu_map__build_die_map(struct cpu_map *cpus, struct cpu_map **diep);
|
|
int cpu_map__build_core_map(struct cpu_map *cpus, struct cpu_map **corep);
|
|
const struct cpu_map *cpu_map__online(void); /* thread unsafe */
|
|
|
|
struct cpu_map *cpu_map__get(struct cpu_map *map);
|
|
void cpu_map__put(struct cpu_map *map);
|
|
|
|
static inline int cpu_map__socket(struct cpu_map *sock, int s)
|
|
{
|
|
if (!sock || s > sock->nr || s < 0)
|
|
return 0;
|
|
return sock->map[s];
|
|
}
|
|
|
|
static inline int cpu_map__id_to_socket(int id)
|
|
{
|
|
return id >> 24;
|
|
}
|
|
|
|
static inline int cpu_map__id_to_die(int id)
|
|
{
|
|
return (id >> 16) & 0xff;
|
|
}
|
|
|
|
static inline int cpu_map__id_to_cpu(int id)
|
|
{
|
|
return id & 0xffff;
|
|
}
|
|
|
|
static inline int cpu_map__nr(const struct cpu_map *map)
|
|
{
|
|
return map ? map->nr : 1;
|
|
}
|
|
|
|
static inline bool cpu_map__empty(const struct cpu_map *map)
|
|
{
|
|
return map ? map->map[0] == -1 : true;
|
|
}
|
|
|
|
int cpu__setup_cpunode_map(void);
|
|
|
|
int cpu__max_node(void);
|
|
int cpu__max_cpu(void);
|
|
int cpu__max_present_cpu(void);
|
|
int cpu__get_node(int cpu);
|
|
|
|
int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,
|
|
int (*f)(struct cpu_map *map, int cpu, void *data),
|
|
void *data);
|
|
|
|
int cpu_map__cpu(struct cpu_map *cpus, int idx);
|
|
bool cpu_map__has(struct cpu_map *cpus, int cpu);
|
|
int cpu_map__idx(struct cpu_map *cpus, int cpu);
|
|
#endif /* __PERF_CPUMAP_H */
|