diff mbox

[dpdk-dev] usertools: fix cpu_layout script for multithreads of more than 2

Message ID a052e6f8f637230cc2c0f5e5657735e58bc80b70.1493375418.git.gowrishankar.m@linux.vnet.ibm.com (mailing list archive)
State Accepted, archived
Headers

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch warning coding style issues

Commit Message

Gowrishankar April 28, 2017, 10:34 a.m. UTC 
  From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>

Current usertools/cpu_layout.py is broken to handle multithreads of count more
than 2 as in IBM powerpc P8 servers. Below patch addressed this issue. Also,
added minor exception catch on failing to open unavailable sys file in case of
multithread=off configuration in server.

Patch has been verified not to break existing topology configurations
and also not changing anything in current output.

Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
---
 usertools/cpu_layout.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

Comments

Thomas Monjalon April 28, 2017, 11:58 a.m. UTC | #1 
Andriy, please would you like to review this patch?

28/04/2017 12:34, Gowrishankar:
> From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
> 
> Current usertools/cpu_layout.py is broken to handle multithreads of count more
> than 2 as in IBM powerpc P8 servers. Below patch addressed this issue. Also,
> added minor exception catch on failing to open unavailable sys file in case of
> multithread=off configuration in server.
> 
> Patch has been verified not to break existing topology configurations
> and also not changing anything in current output.
> 
> Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
> ---
>  usertools/cpu_layout.py | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
> index 5735891..99152a2 100755
> --- a/usertools/cpu_layout.py
> +++ b/usertools/cpu_layout.py
> @@ -46,6 +46,8 @@
>  for cpu in xrange(max_cpus + 1):
>      try:
>          fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
> +    except IOError:
> +        continue
>      except:
>          break
>      core = int(fd.read())
> @@ -70,7 +72,10 @@
>  print("")
>  
>  max_processor_len = len(str(len(cores) * len(sockets) * 2 - 1))
> -max_core_map_len = max_processor_len * 2 + len('[, ]') + len('Socket ')
> +max_thread_count = len(core_map.values()[0])
> +max_core_map_len = (max_processor_len * max_thread_count)  \
> +                      + len(", ") * (max_thread_count - 1) \
> +                      + len('[]') + len('Socket ')
>  max_core_id_len = len(str(max(cores)))
>  
>  output = " ".ljust(max_core_id_len + len('Core '))
> @@ -87,5 +92,8 @@
>  for c in cores:
>      output = "Core %s" % str(c).ljust(max_core_id_len)
>      for s in sockets:
> -        output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
> +        if core_map.has_key((s,c)):
> +            output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
> +        else:
> +            output += " " * (max_core_map_len + 1)
>      print(output)
>
Andriy Berestovskyy April 28, 2017, 12:25 p.m. UTC | #2 
Works fine on ThunderX and does not brake Intel either.

Reviewed-by: Andriy Berestovskyy <andriy.berestovskyy@caviumnetworks.com>
Tested-by: Andriy Berestovskyy <andriy.berestovskyy@caviumnetworks.com>

Andriy

On 28.04.2017 13:58, Thomas Monjalon wrote:
> Andriy, please would you like to review this patch?
>
> 28/04/2017 12:34, Gowrishankar:
>> From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
>>
>> Current usertools/cpu_layout.py is broken to handle multithreads of count more
>> than 2 as in IBM powerpc P8 servers. Below patch addressed this issue. Also,
>> added minor exception catch on failing to open unavailable sys file in case of
>> multithread=off configuration in server.
>>
>> Patch has been verified not to break existing topology configurations
>> and also not changing anything in current output.
>>
>> Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
>> ---
>>  usertools/cpu_layout.py | 12 ++++++++++--
>>  1 file changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
>> index 5735891..99152a2 100755
>> --- a/usertools/cpu_layout.py
>> +++ b/usertools/cpu_layout.py
>> @@ -46,6 +46,8 @@
>>  for cpu in xrange(max_cpus + 1):
>>      try:
>>          fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
>> +    except IOError:
>> +        continue
>>      except:
>>          break
>>      core = int(fd.read())
>> @@ -70,7 +72,10 @@
>>  print("")
>>
>>  max_processor_len = len(str(len(cores) * len(sockets) * 2 - 1))
>> -max_core_map_len = max_processor_len * 2 + len('[, ]') + len('Socket ')
>> +max_thread_count = len(core_map.values()[0])
>> +max_core_map_len = (max_processor_len * max_thread_count)  \
>> +                      + len(", ") * (max_thread_count - 1) \
>> +                      + len('[]') + len('Socket ')
>>  max_core_id_len = len(str(max(cores)))
>>
>>  output = " ".ljust(max_core_id_len + len('Core '))
>> @@ -87,5 +92,8 @@
>>  for c in cores:
>>      output = "Core %s" % str(c).ljust(max_core_id_len)
>>      for s in sockets:
>> -        output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
>> +        if core_map.has_key((s,c)):
>> +            output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
>> +        else:
>> +            output += " " * (max_core_map_len + 1)
>>      print(output)
>>
>
>
>
Thomas Monjalon April 30, 2017, 1:29 p.m. UTC | #3 
28/04/2017 14:25, Andriy Berestovskyy:
> Works fine on ThunderX and does not brake Intel either.
> 
> Reviewed-by: Andriy Berestovskyy <andriy.berestovskyy@caviumnetworks.com>
> Tested-by: Andriy Berestovskyy <andriy.berestovskyy@caviumnetworks.com>
> 
> Andriy
> 
> On 28.04.2017 13:58, Thomas Monjalon wrote:
> > Andriy, please would you like to review this patch?
> >
> > 28/04/2017 12:34, Gowrishankar:
> >> From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
> >>
> >> Current usertools/cpu_layout.py is broken to handle multithreads of count more
> >> than 2 as in IBM powerpc P8 servers. Below patch addressed this issue. Also,
> >> added minor exception catch on failing to open unavailable sys file in case of
> >> multithread=off configuration in server.
> >>
> >> Patch has been verified not to break existing topology configurations
> >> and also not changing anything in current output.
> >>
> >> Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>

Applied, thanks
diff mbox

Patch

diff --git a/usertools/cpu_layout.py b/usertools/cpu_layout.py
index 5735891..99152a2 100755
--- a/usertools/cpu_layout.py
+++ b/usertools/cpu_layout.py
@@ -46,6 +46,8 @@ 
 for cpu in xrange(max_cpus + 1):
     try:
         fd = open("{}/cpu{}/topology/core_id".format(base_path, cpu))
+    except IOError:
+        continue
     except:
         break
     core = int(fd.read())
@@ -70,7 +72,10 @@ 
 print("")
 
 max_processor_len = len(str(len(cores) * len(sockets) * 2 - 1))
-max_core_map_len = max_processor_len * 2 + len('[, ]') + len('Socket ')
+max_thread_count = len(core_map.values()[0])
+max_core_map_len = (max_processor_len * max_thread_count)  \
+                      + len(", ") * (max_thread_count - 1) \
+                      + len('[]') + len('Socket ')
 max_core_id_len = len(str(max(cores)))
 
 output = " ".ljust(max_core_id_len + len('Core '))
@@ -87,5 +92,8 @@ 
 for c in cores:
     output = "Core %s" % str(c).ljust(max_core_id_len)
     for s in sockets:
-        output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
+        if core_map.has_key((s,c)):
+            output += " " + str(core_map[(s, c)]).ljust(max_core_map_len)
+        else:
+            output += " " * (max_core_map_len + 1)
     print(output)