[3/3] perf header: Rename "sibling cores" to "sibling sockets"
diff mbox series

Message ID 1558644081-17738-3-git-send-email-kan.liang@linux.intel.com
State New
Headers show
Series
  • [1/3] perf header: Add die information in CPU topology
Related show

Commit Message

Liang, Kan May 23, 2019, 8:41 p.m. UTC
From: Kan Liang <kan.liang@linux.intel.com>

The "sibling cores" actually shows the sibling CPUs of a socket.
The name "sibling cores" is very misleading.

Rename "sibling cores" to "sibling sockets"

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
---
 tools/perf/Documentation/perf.data-file-format.txt | 2 +-
 tools/perf/util/header.c                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jiri Olsa May 28, 2019, 8:59 a.m. UTC | #1
On Thu, May 23, 2019 at 01:41:21PM -0700, kan.liang@linux.intel.com wrote:
> From: Kan Liang <kan.liang@linux.intel.com>
> 
> The "sibling cores" actually shows the sibling CPUs of a socket.
> The name "sibling cores" is very misleading.
> 
> Rename "sibling cores" to "sibling sockets"

by checking on die topology, I found that thread_siblings_list
is deprecated/renamed to core_cpus_list.. we should keep that
in mind and support both

jirka

> 
> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
> ---
>  tools/perf/Documentation/perf.data-file-format.txt | 2 +-
>  tools/perf/util/header.c                           | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/perf/Documentation/perf.data-file-format.txt
> index c731416..dd85163 100644
> --- a/tools/perf/Documentation/perf.data-file-format.txt
> +++ b/tools/perf/Documentation/perf.data-file-format.txt
> @@ -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
> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
> index faa1e38..eb79495 100644
> --- a/tools/perf/util/header.c
> +++ b/tools/perf/util/header.c
> @@ -1465,7 +1465,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;
>  	}
>  
> -- 
> 2.7.4
>
Liang, Kan May 28, 2019, 7:05 p.m. UTC | #2
On 5/28/2019 4:59 AM, Jiri Olsa wrote:
> On Thu, May 23, 2019 at 01:41:21PM -0700, kan.liang@linux.intel.com wrote:
>> From: Kan Liang <kan.liang@linux.intel.com>
>>
>> The "sibling cores" actually shows the sibling CPUs of a socket.
>> The name "sibling cores" is very misleading.
>>
>> Rename "sibling cores" to "sibling sockets"
> 
> by checking on die topology, I found that thread_siblings_list
> is deprecated/renamed to core_cpus_list.. we should keep that
> in mind and support both
>

Sure, I will introduce THRD_SIB_FMT_NEW for the new name.
#define THRD_SIB_FMT_NEW \
	"%s/devices/system/cpu/cpu%d/topology/core_cpus_list"

I will check new name first, (if N/A, then check the old name), before 
parsing the topology information.

I will add the change in V2.

Thanks,
Kan



> jirka
> 
>>
>> Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
>> ---
>>   tools/perf/Documentation/perf.data-file-format.txt | 2 +-
>>   tools/perf/util/header.c                           | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/perf/Documentation/perf.data-file-format.txt
>> index c731416..dd85163 100644
>> --- a/tools/perf/Documentation/perf.data-file-format.txt
>> +++ b/tools/perf/Documentation/perf.data-file-format.txt
>> @@ -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
>> diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
>> index faa1e38..eb79495 100644
>> --- a/tools/perf/util/header.c
>> +++ b/tools/perf/util/header.c
>> @@ -1465,7 +1465,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;
>>   	}
>>   
>> -- 
>> 2.7.4
>>

Patch
diff mbox series

diff --git a/tools/perf/Documentation/perf.data-file-format.txt b/tools/perf/Documentation/perf.data-file-format.txt
index c731416..dd85163 100644
--- a/tools/perf/Documentation/perf.data-file-format.txt
+++ b/tools/perf/Documentation/perf.data-file-format.txt
@@ -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
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index faa1e38..eb79495 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1465,7 +1465,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;
 	}