perf cpumap: Retrieve die id information
PATCH v3 1/5 perf cpumap: Retrieve die id information
From: Kan Liang <[email protected]>
There is no function to retrieve die id information of a given CPU.
Add cpu_map__get_die_id() to retrieve die id information.
---
No changes since V2.
tools/perf/util/cpumap.c | 7 +++++++ tools/perf/util/cpumap.h | 1 + 2 files changed, 8 insertions(+)
tools/perf/util/cpumap.c +7 -0
@@ -373,6 +373,13 @@ int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,return 0 ; } +int cpu_map__get_die_id (int cpu) +{ +int value, ret =cpu__get_topology_int (cpu,"die_id" , &value); + +return ret ?: value; +} +int cpu_map__get_core_id (int cpu) {int value, ret =cpu__get_topology_int (cpu,"core_id" , &value);
tools/perf/util/cpumap.h +1 -0
@@ -25,6 +25,7 @@ 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_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);
Signature · 1 line
2.7.4
PATCH v3 2/5 perf header: Add die information in CPU topology
From: Kan Liang <[email protected]>
With the new CPUID.1F, a new level type of CPU topology, 'die', is introduced. The 'die' information in CPU topology should be added in perf header.
To be compatible with old perf.data, the patch checks the section size before reading the die information. The new info is added at the end of the cpu_topology section, the old perf tool ignores the extra data. It never reads data crossing the section boundary.
The new perf tool with the patch can be used on legacy kernel. Add a new function has_die_topology() to check if die topology information is supported by kernel. The function only check X86 and CPU 0. Assuming other CPUs have same topology.
Use similar method for core and socket to support die id and sibling dies string.
---
No changes since V2.
tools/perf/Documentation/perf.data-file-format.txt | 9 ++- tools/perf/util/cputopo.c | 76 +++++++++++++++-- tools/perf/util/cputopo.h | 2 + tools/perf/util/env.c | 1 + tools/perf/util/env.h | 3 + tools/perf/util/header.c | 94 ++++++++++++++++++++-- 6 files changed, 172 insertions(+), 13 deletions(-)
tools/perf/Documentation/perf.data-file-format.txt +7 -2
@@ -153,7 +153,7 @@ struct { String lists defining the core and CPU threads topology. The string lists are followed by a variable length array -which contains core_id and socket_id of each cpu. +which contains core_id, die_id (for x86) and socket_id of each cpu. The number of entries can be determined by the size of the section minus the sizes of both string lists.
@@ -162,14 +162,19 @@ struct { struct perf_header_string_list threads; /* Variable length */ struct { uint32_t core_id; + uint32_t die_id; uint32_t socket_id; } cpus[nr]; /* Variable length records */ }; Example: - sibling cores : 0-3 + sibling cores : 0-8 + sibling dies : 0-3 + sibling dies : 4-7 sibling threads : 0-1 sibling threads : 2-3 + sibling threads : 4-5 + sibling threads : 6-7 HEADER_NUMA_TOPOLOGY = 14,
tools/perf/util/cputopo.c +71 -5
137 lines not on this page · raw message
tools/perf/util/cputopo.h +2 -0
@@ -7,8 +7,10 @@struct cpu_topology {u32 core_sib; +u32 die_sib;u32 thread_sib;char **core_siblings; +char **die_siblings;char **thread_siblings; };
tools/perf/util/env.c +1 -0
@@ -246,6 +246,7 @@ int perf_env__read_cpu_topology_map(struct perf_env *env)for (cpu =0 ; cpu < nr_cpus; ++cpu) { env->cpu[cpu].core_id =cpu_map__get_core_id (cpu); env->cpu[cpu].socket_id =cpu_map__get_socket_id (cpu); + env->cpu[cpu].die_id =cpu_map__get_die_id (cpu); } env->nr_cpus_avail = nr_cpus;
tools/perf/util/env.h +3 -0
@@ -9,6 +9,7 @@struct cpu_topology_map {int socket_id; +int die_id;int core_id; };
@@ -49,6 +50,7 @@ struct perf_env {int nr_cmdline;int nr_sibling_cores; +int nr_sibling_dies;int nr_sibling_threads;int nr_numa_nodes;int nr_memory_nodes;
@@ -57,6 +59,7 @@ struct perf_env {char *cmdline;const char **cmdline_argv;char *sibling_cores; +char *sibling_dies;char *sibling_threads;char *pmu_mappings;struct cpu_topology_map *cpu;
tools/perf/util/header.c +88 -6
124 lines not on this page · raw message
Signature · 1 line
2.7.4
Re: [PATCH V3 2/5] perf header: Add die information in CPU topology
Em Tue, Jun 04, 2019 at 03:50:41PM -0700, [email protected] escreveu:
Quoted 11 lines
From: Kan Liang <[email protected]>
With the new CPUID.1F, a new level type of CPU topology, 'die', is introduced. The 'die' information in CPU topology should be added in perf header.
To be compatible with old perf.data, the patch checks the section size before reading the die information. The new info is added at the end of the
cpu_topologysection, the old perf tool ignores the extra data. It never reads data crossing the section boundary.
Quoted 4 lines
The new perf tool with the patch can be used on legacy kernel. Add a new function
has_die_topology()to check if die topology information is supported by kernel. The function only check X86 and CPU 0. Assuming other CPUs have same topology.
You're changing the header, how would a new tool handle an old perf.data where this 'die_id' is not present? What about an old tool dealing with a perf.data with this die_id?
I couldn't see any provision for that, am I missing something?
/me goes to read tools/perf/util/cputopo.c ...
Yeah, its just the description on the perf.data doc file that confused me, I'll clarify that after finishing reviewing/applying this patchkit.
- Arnaldo
Quoted 30 lines
Use similar method for core and socket to support die id and sibling dies string.
Signed-off-by Kan Liang <[email protected]>---
No changes since V2.
tools/perf/Documentation/perf.data-file-format.txt | 9 ++- tools/perf/util/cputopo.c | 76 +++++++++++++++-- tools/perf/util/cputopo.h | 2 + tools/perf/util/env.c | 1 + tools/perf/util/env.h | 3 + tools/perf/util/header.c | 94 ++++++++++++++++++++-- 6 files changed, 172 insertions(+), 13 deletions(-)tools/perf/Documentation/perf.data-file-format.txt +1
-1@@ -153,7 +153,7 @@ struct { String lists defining the core and CPU threads topology. The string lists are followed by a variable length array -which contains core_id and socket_id of each cpu. +which contains core_id, die_id (for x86) and socket_id of each cpu. The number of entries can be determined by the size of the section minus the sizes of both string lists.
tools/perf/Documentation/perf.data-file-format.txt struct { · line 168
Quoted 7 lines
tools/perf/Documentation/perf.data-file-format.txt +1
-0@@ -162,14 +162,19 @@ struct { struct perf_header_string_list threads; /* Variable length */ struct { uint32_t core_id; + uint32_t die_id; uint32_t socket_id; } cpus[nr]; /* Variable length records */ };
- Arnaldo
Quoted 350 lines
tools/perf/Documentation/perf.data-file-format.txt +5
-1Example: - sibling cores : 0-3 + sibling cores : 0-8 + sibling dies : 0-3 + sibling dies : 4-7 sibling threads : 0-1 sibling threads : 2-3 + sibling threads : 4-5 + sibling threads : 6-7 HEADER_NUMA_TOPOLOGY = 14,tools/perf/util/cputopo.c +71
-5@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #include <sys/param.h> +#include <sys/utsname.h> #include <inttypes.h> #include <api/fs/fs.h> @@ -8,9 +9,10 @@#include "util.h" #include "env.h" -#define CORE_SIB_FMT \ "%s/devices/system/cpu/cpu%d/topology/core_siblings_list" +#define DIE_SIB_FMT \ + "%s/devices/system/cpu/cpu%d/topology/die_cpus_list"#define THRD_SIB_FMT \ "%s/devices/system/cpu/cpu%d/topology/thread_siblings_list"#define NODE_ONLINE_FMT \@@ -34,12 +36,12 @@ static int build_cpu_topology(struct cpu_topology *tp, int cpu) sysfs__mountpoint(), cpu); fp =fopen (filename,"r" );if (!fp) - goto try_threads; + goto try_dies; sret =getline (&buf, &len, fp);fclose (fp);if (sret <=0 ) - goto try_threads; + goto try_dies; p =strchr (buf,'\n' );if (p)@@ -57,6 +59,37 @@ static int build_cpu_topology(struct cpu_topology *tp, int cpu) } ret =0 ; +try_dies: +if (!tp->die_siblings) + goto try_threads; + +scnprintf (filename,MAXPATHLEN ,DIE_SIB_FMT , +sysfs__mountpoint (), cpu); + fp =fopen (filename,"r" ); +if (!fp) + goto try_threads; + + sret =getline (&buf, &len, fp); +fclose (fp); +if (sret <=0 ) + goto try_threads; + + p =strchr (buf,'\n' ); +if (p) + *p ='\0' ; + +for (i =0 ; i < tp->die_sib; i++) { +if (!strcmp (buf, tp->die_siblings[i])) +break ; + } +if (i == tp->die_sib) { + tp->die_siblings[i] = buf; + tp->die_sib++; + buf =NULL ; + len =0 ; + } + ret =0 ; + try_threads:scnprintf (filename,MAXPATHLEN ,THRD_SIB_FMT ,sysfs__mountpoint (), cpu);@@ -98,21 +131,46 @@ void cpu_topology__delete(struct cpu_topology *tp)for (i =0 ; i < tp->core_sib; i++)zfree (&tp->core_siblings[i]); +if (tp->die_sib) { +for (i =0 ; i < tp->die_sib; i++) +zfree (&tp->die_siblings[i]); + } +for (i =0 ; i < tp->thread_sib; i++)zfree (&tp->thread_siblings[i]);free (tp); } +static bool has_die_topology (void ) +{ +char filename[MAXPATHLEN ]; +struct utsname uts; + +if (uname (&uts) <0 ) +return false; + +if (strncmp (uts.machine,"x86_64" ,6 )) +return false; + +scnprintf (filename,MAXPATHLEN ,DIE_SIB_FMT , +sysfs__mountpoint (),0 ); +if (access (filename,F_OK ) ==-1 ) +return false; + +return true; +} +struct cpu_topology *cpu_topology__new (void ) {struct cpu_topology *tp =NULL ;void *addr; -u32 nr, i; +u32 nr, i, nr_addr;size_t sz;long ncpus;int ret =-1 ;struct cpu_map *map; +bool has_die =has_die_topology (); ncpus =cpu__max_present_cpu ();@@ -126,7 +184,11 @@ struct cpu_topology *cpu_topology__new(void) nr = (u32)(ncpus &UINT_MAX ); sz = nr *sizeof (char *); - addr =calloc (1 ,sizeof (*tp) +2 * sz); +if (has_die) + nr_addr =3 ; +else + nr_addr =2 ; + addr =calloc (1 ,sizeof (*tp) + nr_addr * sz);if (!addr) goto out_free;@@ -134,6 +196,10 @@ struct cpu_topology *cpu_topology__new(void) addr +=sizeof (*tp); tp->core_siblings = addr; addr += sz; +if (has_die) { + tp->die_siblings = addr; + addr += sz; + } tp->thread_siblings = addr;for (i =0 ; i < nr; i++) {tools/perf/util/cputopo.h +2
-0@@ -7,8 +7,10 @@struct cpu_topology {u32 core_sib; +u32 die_sib;u32 thread_sib;char **core_siblings; +char **die_siblings;char **thread_siblings; };tools/perf/util/env.c +1
-0@@ -246,6 +246,7 @@ int perf_env__read_cpu_topology_map(struct perf_env *env)for (cpu =0 ; cpu < nr_cpus; ++cpu) { env->cpu[cpu].core_id =cpu_map__get_core_id (cpu); env->cpu[cpu].socket_id =cpu_map__get_socket_id (cpu); + env->cpu[cpu].die_id =cpu_map__get_die_id (cpu); } env->nr_cpus_avail = nr_cpus;tools/perf/util/env.h +3
-0@@ -9,6 +9,7 @@struct cpu_topology_map {int socket_id; +int die_id;int core_id; };@@ -49,6 +50,7 @@ struct perf_env {int nr_cmdline;int nr_sibling_cores; +int nr_sibling_dies;int nr_sibling_threads;int nr_numa_nodes;int nr_memory_nodes;@@ -57,6 +59,7 @@ struct perf_env {char *cmdline;const char **cmdline_argv;char *sibling_cores; +char *sibling_dies;char *sibling_threads;char *pmu_mappings;struct cpu_topology_map *cpu;tools/perf/util/header.c +88
-6@@ -599,6 +599,27 @@ static int write_cpu_topology(struct feat_fd *ff,if (ret <0 )return ret; } + +if (!tp->die_sib) + goto done; + + ret =do_write (ff, &tp->die_sib,sizeof (tp->die_sib)); +if (ret <0 ) + goto done; + +for (i =0 ; i < tp->die_sib; i++) { + ret =do_write_string (ff, tp->die_siblings[i]); +if (ret <0 ) + goto done; + } + +for (j =0 ; j < perf_env.nr_cpus_avail; j++) { + ret =do_write (ff, &perf_env.cpu[j].die_id, +sizeof (perf_env.cpu[j].die_id)); +if (ret <0 ) +return ret; + } + done:cpu_topology__delete (tp);return ret;@@ -1443,6 +1464,16 @@ static void print_cpu_topology(struct feat_fd *ff, FILE *fp) str +=strlen (str) +1 ; } +if (ph->env.nr_sibling_dies) { + nr = ph->env.nr_sibling_dies; + str = ph->env.sibling_dies; + +for (i =0 ; i < nr; i++) { +fprintf (fp,"# sibling dies : %s\n" , str); + str +=strlen (str) +1 ; + } + } + nr = ph->env.nr_sibling_threads; str = ph->env.sibling_threads;@@ -1451,12 +1482,28 @@ static void print_cpu_topology(struct feat_fd *ff, FILE *fp) str +=strlen (str) +1 ; } -if (ph->env.cpu !=NULL ) { -for (i =0 ; i < cpu_nr; i++) -fprintf (fp,"# CPU %d: Core ID %d, Socket ID %d\n" , i, - ph->env.cpu[i].core_id, ph->env.cpu[i].socket_id); - }else -fprintf (fp,"# Core ID and Socket ID information is not available\n" ); +if (ph->env.nr_sibling_dies) { +if (ph->env.cpu !=NULL ) { +for (i =0 ; i < cpu_nr; i++) +fprintf (fp,"# CPU %d: Core ID %d, " +"Die ID %d, Socket ID %d\n" , + i, ph->env.cpu[i].core_id, + ph->env.cpu[i].die_id, + ph->env.cpu[i].socket_id); + }else +fprintf (fp,"# Core ID, Die ID and Socket ID " +"information is not available\n" ); + }else { +if (ph->env.cpu !=NULL ) { +for (i =0 ; i < cpu_nr; i++) +fprintf (fp,"# CPU %d: Core ID %d, " +"Socket ID %d\n" , + i, ph->env.cpu[i].core_id, + ph->env.cpu[i].socket_id); + }else +fprintf (fp,"# Core ID and Socket ID " +"information is not available\n" ); + } }static void print_clockid (struct feat_fd *ff,FILE *fp)@@ -2214,6 +2261,7 @@ static int process_cpu_topology(struct feat_fd *ff, void *data __maybe_unused) goto free_cpu; ph->env.cpu[i].core_id = nr; + size +=sizeof (u32);if (do_read_u32 (ff, &nr)) goto free_cpu;@@ -2225,6 +2273,40 @@ static int process_cpu_topology(struct feat_fd *ff, void *data __maybe_unused) } ph->env.cpu[i].socket_id = nr; + size +=sizeof (u32); + } + +/* +* The header may be from old perf, +* which doesn't include die information. +*/ +if (ff->size <= size) +return 0 ; + +if (do_read_u32 (ff, &nr)) +return -1 ; + + ph->env.nr_sibling_dies = nr; + size +=sizeof (u32); + +for (i =0 ; i < nr; i++) { + str =do_read_string (ff); +if (!str) + goto error; + +/* include a NULL character at the end */ +if (strbuf_add (&sb, str,strlen (str) +1 ) <0 ) + goto error; + size +=string_size (str); +free (str); + } + ph->env.sibling_dies =strbuf_detach (&sb,NULL ); + +for (i =0 ; i < (u32 )cpu_nr; i++) { +if (do_read_u32 (ff, &nr)) + goto free_cpu; + + ph->env.cpu[i].die_id = nr; }return 0 ;Signature · 1 line
2.7.4
Signature · 1 line
- Arnaldo
Re: [PATCH V3 2/5] perf header: Add die information in CPU topology
Em Thu, Jun 06, 2019 at 04:12:10PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 21 lines
Em Tue, Jun 04, 2019 at 03:50:41PM -0700, [email protected] escreveu:
Quoted 11 lines
From: Kan Liang <[email protected]>
With the new CPUID.1F, a new level type of CPU topology, 'die', is introduced. The 'die' information in CPU topology should be added in perf header.
To be compatible with old perf.data, the patch checks the section size before reading the die information. The new info is added at the end of the
cpu_topologysection, the old perf tool ignores the extra data. It never reads data crossing the section boundary.Quoted 4 lines
The new perf tool with the patch can be used on legacy kernel. Add a new function
has_die_topology()to check if die topology information is supported by kernel. The function only check X86 and CPU 0. Assuming other CPUs have same topology.You're changing the header, how would a new tool handle an old perf.data where this '
die_id' is not present? What about an old tool dealing with a perf.data with thisdie_id?
Quoted 6 lines
I couldn't see any provision for that, am I missing something?
/me goes to read
tools/perf/util/cputopo.c...Yeah, its just the description on the perf.data doc file that confused me, I'll clarify that after finishing reviewing/applying this patchkit.
So I have this on top, please check.
- Arnaldo
commit a9396a70fc7101c108e1c91fa1771557bbbb57a1
Author: Arnaldo Carvalho de Melo <[email protected]> Date: Thu Jun 6 17:03:18 2019 -0300
perf data: Fix perf.data documentation for HEADER_CPU_TOPOLOGY
The 'die' info isn't in the same array as core and socket ids, and we missed the 'dies' string list, that comes right after the 'core' + 'socket' id variable length array, followed by the VLA for the dies.
tools/perf/Documentation/perf.data-file-format.txt +22 -7
@@ -151,20 +151,35 @@ struct { HEADER_CPU_TOPOLOGY = 13, -String lists defining the core and CPU threads topology. -The string lists are followed by a variable length array -which contains core_id, die_id (for x86) and socket_id of each cpu. -The number of entries can be determined by the size of the -section minus the sizes of both string lists. - struct { + /* + * First revision of HEADER_CPU_TOPOLOGY + * + * See 'struct perf_header_string_list' definition earlier + * in this file. + */ + struct perf_header_string_list cores; /* Variable length */ struct perf_header_string_list threads; /* Variable length */ + + /* + * Second revision of HEADER_CPU_TOPOLOGY, older tools + * will not consider what comes next + */ + struct { uint32_t core_id; - uint32_t die_id; uint32_t socket_id; } cpus[nr]; /* Variable length records */ + /* 'nr' comes from previously processed HEADER_NRCPUS's nr_cpu_avail */ + + /* + * Third revision of HEADER_CPU_TOPOLOGY, older tools + * will not consider what comes next + */ + + struct perf_header_string_list dies; /* Variable length */ + uint32_t die_id[nr_cpus_avail]; /* from previously processed HEADER_NR_CPUS, VLA */ }; Example:
Re: [PATCH V3 2/5] perf header: Add die information in CPU topology
Quoted 22 lines · Arnaldo Carvalho de Melo
Em Thu, Jun 06, 2019 at 04:12:10PM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 21 lines
Em Tue, Jun 04, 2019 at 03:50:41PM -0700, [email protected] escreveu:
Quoted 11 lines
From: Kan Liang <[email protected]>
With the new CPUID.1F, a new level type of CPU topology, 'die', is introduced. The 'die' information in CPU topology should be added in perf header.
To be compatible with old perf.data, the patch checks the section size before reading the die information. The new info is added at the end of the
cpu_topologysection, the old perf tool ignores the extra data. It never reads data crossing the section boundary.Quoted 4 lines
The new perf tool with the patch can be used on legacy kernel. Add a new function
has_die_topology()to check if die topology information is supported by kernel. The function only check X86 and CPU 0. Assuming other CPUs have same topology.You're changing the header, how would a new tool handle an old perf.data where this '
die_id' is not present? What about an old tool dealing with a perf.data with thisdie_id?
Quoted 9 lines
Quoted 6 lines
I couldn't see any provision for that, am I missing something?
/me goes to read
tools/perf/util/cputopo.c...Yeah, its just the description on the perf.data doc file that confused me, I'll clarify that after finishing reviewing/applying this patchkit.
So I have this on top, please check.
It looks good to me.
Thanks,
Kan
Quoted 70 lines
- Arnaldo
commit
a9396a70fc7101c108e1c91fa1771557bbbb57a1Author: Arnaldo Carvalho de Melo <[email protected]> Date: Thu Jun 6 17:03:18 2019 -0300perf data: Fix perf.data documentation for
HEADER_CPU_TOPOLOGYThe 'die' info isn't in the same array as core and socket ids, and we missed the 'dies' string list, that comes right after the 'core' + 'socket' id variable length array, followed by the VLA for the dies.
Cc Adrian Hunter <[email protected]>Cc Andi Kleen <[email protected]>Cc Jiri Olsa <[email protected]>Cc Kan Liang <[email protected]>Cc Namhyung Kim <[email protected]>Cc Peter Zijlstra <[email protected]>Fixes c9cb12c5ba08 ("perf header: Add die information in CPU topology")Signed-off-by Arnaldo Carvalho de Melo <[email protected]>tools/perf/Documentation/perf.data-file-format.txt +22
-7@@ -151,20 +151,35 @@ struct { HEADER_CPU_TOPOLOGY = 13, -String lists defining the core and CPU threads topology. -The string lists are followed by a variable length array -which contains core_id, die_id (for x86) and socket_id of each cpu. -The number of entries can be determined by the size of the -section minus the sizes of both string lists. - struct { + /* + * First revision of HEADER_CPU_TOPOLOGY + * + * See 'struct perf_header_string_list' definition earlier + * in this file. + */ + struct perf_header_string_list cores; /* Variable length */ struct perf_header_string_list threads; /* Variable length */ + + /* + * Second revision of HEADER_CPU_TOPOLOGY, older tools + * will not consider what comes next + */ + struct { uint32_t core_id; - uint32_t die_id; uint32_t socket_id; } cpus[nr]; /* Variable length records */ + /* 'nr' comes from previously processed HEADER_NRCPUS's nr_cpu_avail */ + + /* + * Third revision of HEADER_CPU_TOPOLOGY, older tools + * will not consider what comes next + */ + + struct perf_header_string_list dies; /* Variable length */ + uint32_t die_id[nr_cpus_avail]; /* from previously processed HEADER_NR_CPUS, VLA */ }; Example:
tip-bot for Kan Liang
merge bot[tip:perf/core] perf header: Add die information in CPU topology
In reply to [email protected]perf header: Add die information in CPU topology
Commit-ID: acae8b36cded0ee62038dedd0a44d54d5d673a96 Gitweb: https://git.kernel.org/tip/acae8b36cded0ee62038dedd0a44d54d5d673a96 Author: Kan Liang <[email protected]> AuthorDate: Tue, 4 Jun 2019 15:50:41 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Jun 2019 15:50:02 -0300
perf header: Add die information in CPU topology
With the new CPUID.1F, a new level type of CPU topology, 'die', is introduced. The 'die' information in CPU topology should be added in perf header.
To be compatible with old perf.data, the patch checks the section size before reading the die information. The new info is added at the end of the cpu_topology section, the old perf tool ignores the extra data. It never reads data crossing the section boundary.
The new perf tool with the patch can be used on legacy kernel. Add a new function has_die_topology() to check if die topology information is supported by kernel. The function only check X86 and CPU 0. Assuming other CPUs have same topology.
Use similar method for core and socket to support die id and sibling dies string.
--- tools/perf/Documentation/perf.data-file-format.txt | 9 ++- tools/perf/util/cputopo.c | 76 +++++++++++++++-- tools/perf/util/cputopo.h | 2 + tools/perf/util/env.c | 1 + tools/perf/util/env.h | 3 + tools/perf/util/header.c | 94 ++++++++++++++++++++-- 6 files changed, 172 insertions(+), 13 deletions(-)
tools/perf/Documentation/perf.data-file-format.txt +7 -2
@@ -153,7 +153,7 @@ struct { String lists defining the core and CPU threads topology. The string lists are followed by a variable length array -which contains core_id and socket_id of each cpu. +which contains core_id, die_id (for x86) and socket_id of each cpu. The number of entries can be determined by the size of the section minus the sizes of both string lists.
@@ -162,14 +162,19 @@ struct { struct perf_header_string_list threads; /* Variable length */ struct { uint32_t core_id; + uint32_t die_id; uint32_t socket_id; } cpus[nr]; /* Variable length records */ }; Example: - sibling cores : 0-3 + sibling cores : 0-8 + sibling dies : 0-3 + sibling dies : 4-7 sibling threads : 0-1 sibling threads : 2-3 + sibling threads : 4-5 + sibling threads : 6-7 HEADER_NUMA_TOPOLOGY = 14,
tools/perf/util/cputopo.c +71 -5
137 lines not on this page · raw message
tools/perf/util/cputopo.h +2 -0
@@ -7,8 +7,10 @@struct cpu_topology {u32 core_sib; +u32 die_sib;u32 thread_sib;char **core_siblings; +char **die_siblings;char **thread_siblings; };
tools/perf/util/env.c +1 -0
@@ -246,6 +246,7 @@ int perf_env__read_cpu_topology_map(struct perf_env *env)for (cpu =0 ; cpu < nr_cpus; ++cpu) { env->cpu[cpu].core_id =cpu_map__get_core_id (cpu); env->cpu[cpu].socket_id =cpu_map__get_socket_id (cpu); + env->cpu[cpu].die_id =cpu_map__get_die_id (cpu); } env->nr_cpus_avail = nr_cpus;
tools/perf/util/env.h +3 -0
@@ -9,6 +9,7 @@struct cpu_topology_map {int socket_id; +int die_id;int core_id; };
@@ -49,6 +50,7 @@ struct perf_env {int nr_cmdline;int nr_sibling_cores; +int nr_sibling_dies;int nr_sibling_threads;int nr_numa_nodes;int nr_memory_nodes;
@@ -57,6 +59,7 @@ struct perf_env {char *cmdline;const char **cmdline_argv;char *sibling_cores; +char *sibling_dies;char *sibling_threads;char *pmu_mappings;struct cpu_topology_map *cpu;
tools/perf/util/header.c +88 -6
124 lines not on this page · raw message
PATCH v3 3/5 perf stat: Support per-die aggregation
In reply to [email protected]From: Kan Liang <[email protected]>
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.
---
Changes since V2:
- Fix the comments
- Drop "Please upgrade the perf tool." in warning
- Check core number in warning as well
- Fix a bug in cpu_map__get_core(). The cpu_map__get_die() is already return the combination of socket + die id.
tools/perf/Documentation/perf-stat.txt | 10 ++++ tools/perf/builtin-stat.c | 88 +++++++++++++++++++++++++++++++--- tools/perf/util/cpumap.c | 57 +++++++++++++++++++--- tools/perf/util/cpumap.h | 9 +++- tools/perf/util/stat-display.c | 29 +++++++++-- tools/perf/util/stat-shadow.c | 1 + tools/perf/util/stat.c | 1 + tools/perf/util/stat.h | 1 + 8 files changed, 178 insertions(+), 18 deletions(-)
tools/perf/Documentation/perf-stat.txt +10 -0
@@ -200,6 +200,13 @@ use --per-socket in addition to -a. (system-wide). The output includes the socket number and the number of online processors on that socket. This is useful to gauge the amount of aggregation. +--per-die:: +Aggregate counts per processor die for system-wide mode measurements. This +is a useful mode to detect imbalance between dies. To enable this mode, +use --per-die in addition to -a. (system-wide). The output includes the +die number and the number of online processors on that die. This is +useful to gauge the amount of aggregation. + --per-core:: Aggregate counts per physical processor for system-wide mode measurements. This is a useful mode to detect imbalance between physical cores. To enable this mode,
@@ -239,6 +246,9 @@ Input file name. --per-socket:: Aggregate counts per processor socket for system-wide mode measurements. +--per-die:: +Aggregate counts per processor die for system-wide mode measurements. + --per-core:: Aggregate counts per physical processor for system-wide mode measurements.
tools/perf/builtin-stat.c +82 -6
151 lines not on this page · raw message
tools/perf/util/cpumap.c +50 -7
86 lines not on this page · raw message
tools/perf/util/cpumap.h +8 -1
@@ -26,9 +26,11 @@ 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 */
@@ -44,7 +46,12 @@ static inline int cpu_map__socket(struct cpu_map *sock, int s)static inline int cpu_map__id_to_socket (int id) { -return id >>16 ; +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)
tools/perf/util/stat-display.c +25 -4
@@ -69,8 +69,9 @@ static void aggr_printout(struct perf_stat_config *config, {switch (config->aggr_mode) {case AGGR_CORE : - fprintf(config->output, "S%d-C%*d%s%*d%s", + fprintf(config->output, "S%d-D%d-C%*d%s%*d%s", cpu_map__id_to_socket(id), + cpu_map__id_to_die(id), config->csv_output ? 0 : -8, cpu_map__id_to_cpu(id), config->csv_sep,
@@ -78,6 +79,16 @@ static void aggr_printout(struct perf_stat_config *config, nr, config->csv_sep);break ; +case AGGR_DIE : +fprintf (config->output,"S%d-D%*d%s%*d%s" , +cpu_map__id_to_socket (id <<16 ), + config->csv_output ?0 :-8 , +cpu_map__id_to_die (id <<16 ), + config->csv_sep, + config->csv_output ?0 :4 , + nr, + config->csv_sep); +break ;case AGGR_SOCKET : fprintf(config->output, "S%*d%s%*d%s", config->csv_output ? 0 : -5,
@@ -89,8 +100,9 @@ static void aggr_printout(struct perf_stat_config *config,break ;case AGGR_NONE :if (evsel->percore) { -fprintf (config->output,"S%d-C%*d%s" , +fprintf (config->output,"S%d-D%d-C%*d%s" ,cpu_map__id_to_socket (id), +cpu_map__id_to_die (id), config->csv_output ?0 :-5 ,cpu_map__id_to_cpu (id), config->csv_sep); }else {
@@ -407,6 +419,7 @@ static void printout(struct perf_stat_config *config, int id, int nr, [AGGR_THREAD] = 1, [AGGR_NONE] = 1, [AGGR_SOCKET] = 2, + [AGGR_DIE] = 2, [AGGR_CORE] = 2, };
@@ -879,7 +892,8 @@ static void print_no_aggr_metric(struct perf_stat_config *config, }static int aggr_header_lens[] = { - [AGGR_CORE ] =18 , + [AGGR_CORE ] =24 , + [AGGR_DIE ] =18 , [AGGR_SOCKET ] =12 , [AGGR_NONE ] =6 , [AGGR_THREAD ] =24 ,
@@ -888,6 +902,7 @@ static int aggr_header_lens[] = {static const char *aggr_header_csv[] = { [AGGR_CORE ] ="core,cpus," , + [AGGR_DIE ] ="die,cpus" , [AGGR_SOCKET ] ="socket,cpus" , [AGGR_NONE ] ="cpu," , [AGGR_THREAD ] ="comm-pid," ,
@@ -954,8 +969,13 @@ static void print_interval(struct perf_stat_config *config,if (!metric_only)fprintf (output," counts %*s events\n" , unit_width,"unit" );break ; +case AGGR_DIE : +fprintf (output,"# time die cpus" ); +if (!metric_only) +fprintf (output," counts %*s events\n" , unit_width,"unit" ); +break ;case AGGR_CORE : -fprintf (output,"# time core cpus" ); +fprintf (output,"# time core cpus" );if (!metric_only)fprintf (output," counts %*s events\n" , unit_width,"unit" );break ;
@@ -1165,6 +1185,7 @@ perf_evlist__print_counters(struct perf_evlist *evlist,switch (config->aggr_mode) {case AGGR_CORE : +case AGGR_DIE :case AGGR_SOCKET :print_aggr (config, evlist, prefix);break ;
tools/perf/util/stat-shadow.c +1 -0
@@ -12,6 +12,7 @@/* * AGGR_GLOBAL: Use CPU 0 * AGGR_SOCKET: Use first CPU of socket +* AGGR_DIE: Use first CPU of die * AGGR_CORE: Use first CPU of core * AGGR_NONE: Use matching CPU * AGGR_THREAD: Not supported?
tools/perf/util/stat.c +1 -0
@@ -272,6 +272,7 @@ process_counter_values(struct perf_stat_config *config, struct perf_evsel *evselswitch (config->aggr_mode) {case AGGR_THREAD :case AGGR_CORE : +case AGGR_DIE :case AGGR_SOCKET :case AGGR_NONE :if (!evsel->snapshot)
tools/perf/util/stat.h +1 -0
@@ -44,6 +44,7 @@ enum aggr_mode {AGGR_NONE ,AGGR_GLOBAL ,AGGR_SOCKET , +AGGR_DIE ,AGGR_CORE ,AGGR_THREAD , AGGR_UNSET,
Signature · 1 line
2.7.4
PATCH v3 4/5 perf header: Rename "sibling cores" to "sibling sockets"
In reply to [email protected]From: Kan Liang <[email protected]>
The "sibling cores" actually shows the sibling CPUs of a socket. The name "sibling cores" is very misleading.
Rename "sibling cores" to "sibling sockets"
---
No changes since V2.
tools/perf/Documentation/perf.data-file-format.txt | 2 +- tools/perf/util/header.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf.data-file-format.txt +1 -1
@@ -168,7 +168,7 @@ struct { }; Example: - sibling cores : 0-8 + sibling sockets : 0-8 sibling dies : 0-3 sibling dies : 4-7 sibling threads : 0-1
tools/perf/util/header.c +1 -1
@@ -1460,7 +1460,7 @@ static void print_cpu_topology(struct feat_fd *ff, FILE *fp) str = ph->env.sibling_cores;for (i =0 ; i < nr; i++) { -fprintf (fp,"# sibling cores : %s\n" , str); +fprintf (fp,"# sibling sockets : %s\n" , str); str +=strlen (str) +1 ; }
Signature · 1 line
2.7.4
tip-bot for Kan Liang
merge bot[tip:perf/core] perf header: Rename "sibling cores" to "sibling sockets"
perf header: Rename "sibling cores" to "sibling sockets"
Commit-ID: e05a899718f094e2c87d99115c5b1191405a9fd0 Gitweb: https://git.kernel.org/tip/e05a899718f094e2c87d99115c5b1191405a9fd0 Author: Kan Liang <[email protected]> AuthorDate: Tue, 4 Jun 2019 15:50:43 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Jun 2019 16:20:11 -0300
perf header: Rename "sibling cores" to "sibling sockets"
The "sibling cores" actually shows the sibling CPUs of a socket. The name "sibling cores" is very misleading.
Rename "sibling cores" to "sibling sockets"
--- tools/perf/Documentation/perf.data-file-format.txt | 2 +- tools/perf/util/header.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
tools/perf/Documentation/perf.data-file-format.txt +1 -1
@@ -168,7 +168,7 @@ struct { }; Example: - sibling cores : 0-8 + sibling sockets : 0-8 sibling dies : 0-3 sibling dies : 4-7 sibling threads : 0-1
tools/perf/util/header.c +1 -1
@@ -1460,7 +1460,7 @@ static void print_cpu_topology(struct feat_fd *ff, FILE *fp) str = ph->env.sibling_cores;for (i =0 ; i < nr; i++) { -fprintf (fp,"# sibling cores : %s\n" , str); +fprintf (fp,"# sibling sockets : %s\n" , str); str +=strlen (str) +1 ; }
PATCH v3 5/5 perf tools: Apply new CPU topology sysfs attributes
In reply to [email protected]From: Kan Liang <[email protected]>
The existing "thread_siblings" and "thread_siblings_list" attribute will be deprecated.
Use the new CPU topology sysfs attributes, "core_cpus" and "core_cpus_list", which are synonymous with the deprecated attributes.
Check the new name first. If not available, use the deprecated name to be compatible with old kernel.
---
No changes since V2.
tools/perf/util/cputopo.c | 8 +++++++- tools/perf/util/smt.c | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
tools/perf/util/cputopo.c +7 -1
@@ -15,6 +15,8 @@ "%s/devices/system/cpu/cpu%d/topology/die_cpus_list"#define THRD_SIB_FMT \ "%s/devices/system/cpu/cpu%d/topology/thread_siblings_list" +#define THRD_SIB_FMT_NEW \ + "%s/devices/system/cpu/cpu%d/topology/core_cpus_list"#define NODE_ONLINE_FMT \ "%s/devices/system/node/online"#define NODE_MEMINFO_FMT \
@@ -91,8 +93,12 @@ static int build_cpu_topology(struct cpu_topology *tp, int cpu) ret =0 ; try_threads: -scnprintf (filename,MAXPATHLEN ,THRD_SIB_FMT , +scnprintf (filename,MAXPATHLEN ,THRD_SIB_FMT_NEW ,sysfs__mountpoint (), cpu); +if (access (filename,F_OK ) ==-1 ) { +scnprintf (filename,MAXPATHLEN ,THRD_SIB_FMT , +sysfs__mountpoint (), cpu); + } fp =fopen (filename,"r" );if (!fp) goto done;
tools/perf/util/smt.c +6 -2
@@ -23,8 +23,12 @@ int smt_on(void)char fn[256 ];snprintf (fn,sizeof fn, -"devices/system/cpu/cpu%d/topology/thread_siblings" , - cpu); +"devices/system/cpu/cpu%d/topology/core_cpus" , cpu); +if (access (fn,F_OK ) ==-1 ) { +snprintf (fn,sizeof fn, +"devices/system/cpu/cpu%d/topology/thread_siblings" , + cpu); + }if (sysfs__read_str (fn, &str, &strlen) <0 )continue ;/* Entry is hex, but does not have 0x, so need custom parser */
Signature · 1 line
2.7.4
tip-bot for Kan Liang
merge bot[tip:perf/core] perf tools: Apply new CPU topology sysfs attributes
perf tools: Apply new CPU topology sysfs attributes
Commit-ID: 0ccdb8407a4660f6dbc5977bc060917d2c3e7986 Gitweb: https://git.kernel.org/tip/0ccdb8407a4660f6dbc5977bc060917d2c3e7986 Author: Kan Liang <[email protected]> AuthorDate: Tue, 4 Jun 2019 15:50:44 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Jun 2019 16:20:11 -0300
perf tools: Apply new CPU topology sysfs attributes
The existing "thread_siblings" and "thread_siblings_list" attribute will be deprecated.
Use the new CPU topology sysfs attributes, "core_cpus" and "core_cpus_list", which are synonymous with the deprecated attributes.
Check the new name first. If not available, use the deprecated name to be compatible with old kernel.
--- tools/perf/util/cputopo.c | 8 +++++++- tools/perf/util/smt.c | 8 ++++++-- 2 files changed, 13 insertions(+), 3 deletions(-)
tools/perf/util/cputopo.c +7 -1
@@ -15,6 +15,8 @@ "%s/devices/system/cpu/cpu%d/topology/die_cpus_list"#define THRD_SIB_FMT \ "%s/devices/system/cpu/cpu%d/topology/thread_siblings_list" +#define THRD_SIB_FMT_NEW \ + "%s/devices/system/cpu/cpu%d/topology/core_cpus_list"#define NODE_ONLINE_FMT \ "%s/devices/system/node/online"#define NODE_MEMINFO_FMT \
@@ -91,8 +93,12 @@ try_dies: ret =0 ; try_threads: -scnprintf (filename,MAXPATHLEN ,THRD_SIB_FMT , +scnprintf (filename,MAXPATHLEN ,THRD_SIB_FMT_NEW ,sysfs__mountpoint (), cpu); +if (access (filename,F_OK ) ==-1 ) { +scnprintf (filename,MAXPATHLEN ,THRD_SIB_FMT , +sysfs__mountpoint (), cpu); + } fp =fopen (filename,"r" );if (!fp) goto done;
tools/perf/util/smt.c +6 -2
@@ -23,8 +23,12 @@ int smt_on(void)char fn[256 ];snprintf (fn,sizeof fn, -"devices/system/cpu/cpu%d/topology/thread_siblings" , - cpu); +"devices/system/cpu/cpu%d/topology/core_cpus" , cpu); +if (access (fn,F_OK ) ==-1 ) { +snprintf (fn,sizeof fn, +"devices/system/cpu/cpu%d/topology/thread_siblings" , + cpu); + }if (sysfs__read_str (fn, &str, &strlen) <0 )continue ;/* Entry is hex, but does not have 0x, so need custom parser */
Quoted 10 lines · On Tue, Jun 04, 2019 at 03:50:40PM -0700, [email protected] wrote:
From: Kan Liang <[email protected]>
There is no function to retrieve die id information of a given CPU.
Add
cpu_map__get_die_id()to retrieve die id information.Signed-off-by Kan Liang <[email protected]>---
No changes since V2.
for the whole patchset
thanks,
jirka
Quoted 38 lines
tools/perf/util/cpumap.c | 7 +++++++ tools/perf/util/cpumap.h | 1 + 2 files changed, 8 insertions(+)tools/perf/util/cpumap.c +7
-0@@ -373,6 +373,13 @@ int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,return 0 ; } +int cpu_map__get_die_id (int cpu) +{ +int value, ret =cpu__get_topology_int (cpu,"die_id" , &value); + +return ret ?: value; +} +int cpu_map__get_core_id (int cpu) {int value, ret =cpu__get_topology_int (cpu,"core_id" , &value);tools/perf/util/cpumap.h +1
-0@@ -25,6 +25,7 @@ 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_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);Signature · 1 line
2.7.4
Arnaldo Carvalho de Melo
AppliedEm Wed, Jun 05, 2019 at 11:09:07AM +0200, Jiri Olsa escreveu:
Quoted 7 lines · On Tue, Jun 04, 2019 at 03:50:40PM -0700, [email protected] wrote:
Quoted 6 lines
From: Kan Liang <[email protected]>
There is no function to retrieve die id information of a given CPU.
Add
cpu_map__get_die_id()to retrieve die id information.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Kan Liang <[email protected]>---
No changes since V2.
Reviewed-by Jiri Olsa <[email protected]>for the whole patchset
Thanks, applied.
- Arnaldo
tip-bot for Kan Liang
merge botperf cpumap: Retrieve die id information
Commit-ID: b74d8686a18b36adecc710597198d5ef2dd5ef14 Gitweb: https://git.kernel.org/tip/b74d8686a18b36adecc710597198d5ef2dd5ef14 Author: Kan Liang <[email protected]> AuthorDate: Tue, 4 Jun 2019 15:50:40 -0700 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 10 Jun 2019 15:50:02 -0300
perf cpumap: Retrieve die id information
There is no function to retrieve die id information of a given CPU.
Add cpu_map__get_die_id() to retrieve die id information.
--- tools/perf/util/cpumap.c | 7 +++++++ tools/perf/util/cpumap.h | 1 + 2 files changed, 8 insertions(+)
tools/perf/util/cpumap.c +7 -0
@@ -373,6 +373,13 @@ int cpu_map__build_map(struct cpu_map *cpus, struct cpu_map **res,return 0 ; } +int cpu_map__get_die_id (int cpu) +{ +int value, ret =cpu__get_topology_int (cpu,"die_id" , &value); + +return ret ?: value; +} +int cpu_map__get_core_id (int cpu) {int value, ret =cpu__get_topology_int (cpu,"core_id" , &value);
tools/perf/util/cpumap.h +1 -0
@@ -25,6 +25,7 @@ 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_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);