]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
lscpu: update tests
authorKarel Zak <kzak@redhat.com>
Tue, 3 Nov 2020 10:49:28 +0000 (11:49 +0100)
committerKarel Zak <kzak@redhat.com>
Fri, 13 Nov 2020 08:19:02 +0000 (09:19 +0100)
* cpu MHz is per-CPU value and not printed in summary anymore
* topology is reordered
* number of NUMA nodes is moved to NUMA section
* parsable output uses cache ID from kernel if avalable

Signed-off-by: Karel Zak <kzak@redhat.com>
15 files changed:
tests/expected/lscpu/lscpu-armv7
tests/expected/lscpu/lscpu-ppc-qemu
tests/expected/lscpu/lscpu-ppc64-POWER7
tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu
tests/expected/lscpu/lscpu-s390-kvm
tests/expected/lscpu/lscpu-s390-lpar
tests/expected/lscpu/lscpu-s390-lpar-drawer
tests/expected/lscpu/lscpu-s390-nested-virt
tests/expected/lscpu/lscpu-s390-zvm
tests/expected/lscpu/lscpu-sparc64
tests/expected/lscpu/lscpu-vbox-win
tests/expected/lscpu/lscpu-vmware_fpe
tests/expected/lscpu/lscpu-x86_64-64cpu
tests/expected/lscpu/lscpu-x86_64-dell_e4310
tests/expected/lscpu/lscpu-x86_64-epyc_7451

index 5d1b7f90d0060276a830471c08a50e8ffbd05418..7f1c726c106e2096d4f87b5d370194920ad956d7 100644 (file)
@@ -1,11 +1,11 @@
 CPU(s):              2
 On-line CPU(s) list: 0,1
+Vendor ID:           ARM
+Model name:          Cortex-A15
+Model:               4
 Thread(s) per core:  1
 Core(s) per socket:  2
 Socket(s):           1
-Vendor ID:           ARM
-Model:               4
-Model name:          Cortex-A15
 Stepping:            r0p4
 CPU max MHz:         1700.0000
 CPU min MHz:         200.0000
@@ -14,14 +14,14 @@ Flags:               swp half thumb fastmult vfp edsp thumbee neon vfpv3 tls vfp
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 0,0,0,
 1,1,0,
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 0,0,0,
 1,1,0,
index ab935e5d6ac5e4f9f96bf5745bbfccdf226cdf92..b22ec257688de4c6d7e12506ad6d713ed8bfc5d0 100644 (file)
@@ -1,20 +1,20 @@
 CPU(s):              1
 On-line CPU(s) list: 0
+Model name:          740/750
+Model:               3.1 (pvr 0008 0301)
 Thread(s) per core:  1
 Core(s) per socket:  1
 Socket(s):           1
-Model:               3.1 (pvr 0008 0301)
-Model name:          740/750
 BogoMIPS:            33.25
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i
 0,0,0,,,0,0
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i
 0,0,-,,,0,0
index f1668a40345db53595b0c1b602cf8b4836cabcfb..7e44888593aebc0fe6c0d6b147205921c02bfca9 100644 (file)
@@ -1,18 +1,18 @@
 CPU(s):              16
 On-line CPU(s) list: 0-15
+Model name:          POWER7 (architected), altivec supported
+Model:               2.1 (pvr 003f 0201)
 Thread(s) per core:  4
 Core(s) per socket:  1
 Socket(s):           4
-NUMA node(s):        1
-Model:               2.1 (pvr 003f 0201)
-Model name:          POWER7 (architected), altivec supported
 L1d cache:           128 KiB
 L1i cache:           128 KiB
+NUMA node(s):        1
 NUMA node0 CPU(s):   0-15
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i
 0,0,0,0,,0,0
 1,0,0,0,,0,0
@@ -33,7 +33,7 @@ NUMA node0 CPU(s):   0-15
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i
 0,0,-,0,,0,0
 1,0,-,0,,0,0
index fdda27cb327730a2246157bf90f253d38a03f05f..1af9427069935300a480a671b03a665784dab996 100644 (file)
@@ -1,21 +1,21 @@
 CPU(s):              64
 On-line CPU(s) list: 0-63
+Model name:          POWER7 (architected), altivec supported
+Model:               2.1 (pvr 003f 0201)
 Thread(s) per core:  4
 Core(s) per socket:  1
 Socket(s):           16
-NUMA node(s):        2
-Model:               2.1 (pvr 003f 0201)
-Model name:          POWER7 (architected), altivec supported
 Hypervisor vendor:   pHyp
 Virtualization type: para
 L1d cache:           512 KiB
 L1i cache:           512 KiB
+NUMA node(s):        2
 NUMA node0 CPU(s):   0-63
 NUMA node1 CPU(s):   
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i
 0,0,0,0,,0,0
 1,0,0,0,,0,0
@@ -84,7 +84,7 @@ NUMA node1 CPU(s):
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i
 0,0,-,0,,0,0
 1,0,-,0,,0,0
index 661d84d1c665f92d3b16cc909152ebcc2cbeeef0..3e5d98a4a66e2a92de4387a283b121743b6850f7 100644 (file)
@@ -1,22 +1,22 @@
 CPU op-mode(s):      32-bit, 64-bit
 CPU(s):              3
 On-line CPU(s) list: 0-2
+Vendor ID:           IBM/S390
+Machine type:        2817
 Thread(s) per core:  1
 Core(s) per socket:  1
 Socket(s) per book:  1
 Book(s):             3
-Vendor ID:           IBM/S390
-Machine type:        2817
 BogoMIPS:            14367.00
+Dispatching mode:    horizontal
+Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs
 Hypervisor:          KVM/Linux
 Hypervisor vendor:   KVM
 Virtualization type: full
-Dispatching mode:    horizontal
-Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 0,0,0,
 1,1,1,
@@ -24,7 +24,7 @@ Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 0,0,-,
 1,0,-,
index af02cf5dcac6039b9173fb81f14dcaa83ad470b1..018a30a2c288db6fea99a7850290ecdad014b7ef 100644 (file)
@@ -2,22 +2,22 @@ CPU op-mode(s):       32-bit, 64-bit
 CPU(s):               20
 On-line CPU(s) list:  1-5,8-19
 Off-line CPU(s) list: 0,6,7
+Vendor ID:            IBM/S390
+Machine type:         2817
 Thread(s) per core:   1
 Core(s) per socket:   4
 Socket(s) per book:   6
 Book(s):              4
-Vendor ID:            IBM/S390
-Machine type:         2817
 BogoMIPS:             14367.00
+Dispatching mode:     vertical
+Flags:                esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
 Hypervisor:           PR/SM
 Hypervisor vendor:    IBM
 Virtualization type:  full
-Dispatching mode:     vertical
-Flags:                esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 1,0,0,
 2,1,0,
@@ -39,7 +39,7 @@ Flags:                esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 1,1,-,
 2,1,-,
index df068fac1280f7595a5848178f3a3524daec640a..8edb07deaefc723ab13cd66032d3e7b7b5ea5b88 100644 (file)
@@ -1,33 +1,33 @@
 CPU op-mode(s):      32-bit, 64-bit
 CPU(s):              8
 On-line CPU(s) list: 0-7
+Vendor ID:           IBM/S390
+Machine type:        2964
 Thread(s) per core:  1
 Core(s) per socket:  8
 Socket(s) per book:  3
 Book(s) per drawer:  2
 Drawer(s):           4
-NUMA node(s):        1
-Vendor ID:           IBM/S390
-Machine type:        2964
 CPU dynamic MHz:     5000
 CPU static MHz:      5000
 BogoMIPS:            20325.00
+Dispatching mode:    horizontal
+Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie
 Hypervisor:          PR/SM
 Hypervisor vendor:   IBM
 Virtualization type: full
-Dispatching mode:    horizontal
 L1d cache:           1 MiB
 L1i cache:           768 KiB
 L2d cache:           16 MiB
 L2i cache:           16 MiB
 L3 cache:            64 MiB
 L4 cache:            480 MiB
+NUMA node(s):        1
 NUMA node0 CPU(s):   0-140
-Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx sie
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i
 0,0,0,0,,0,0,0,0
 1,1,0,0,,1,1,1,1
@@ -40,7 +40,7 @@ Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs t
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i
 0,0,2,0,,0,0,0,0
 1,1,2,0,,1,1,1,1
index 2665fd8dc466454d55f2a96dcaf2d0e1fc7f9927..6b931b48a75898b4ff19a0666c0c2acd42676b57 100644 (file)
@@ -1,45 +1,45 @@
 CPU op-mode(s):                  32-bit, 64-bit
 CPU(s):                          2
 On-line CPU(s) list:             0,1
+Vendor ID:                       IBM/S390
+Machine type:                    2964
 Thread(s) per core:              1
 Core(s) per socket:              1
 Socket(s) per book:              1
 Book(s) per drawer:              1
 Drawer(s):                       2
-NUMA node(s):                    1
-Vendor ID:                       IBM/S390
-Machine type:                    2964
 CPU dynamic MHz:                 5000
 CPU static MHz:                  5000
 BogoMIPS:                        3033.00
+Dispatching mode:                horizontal
+Flags:                           esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx
 Hypervisor:                      KVM/Linux
 Hypervisor vendor:               KVM
 Virtualization type:             full
-Dispatching mode:                horizontal
 L1d cache:                       256 KiB
 L1i cache:                       192 KiB
 L2d cache:                       4 MiB
 L2i cache:                       4 MiB
 L3 cache:                        64 MiB
 L4 cache:                        480 MiB
+NUMA node(s):                    1
 NUMA node0 CPU(s):               0,1
 Vulnerability L1tf:              Not affected
 Vulnerability Meltdown:          Not affected
 Vulnerability Spec store bypass: Not affected
 Vulnerability Spectre v1:        Mitigation; __user pointer sanitization
 Vulnerability Spectre v2:        Mitigation; execute trampolines
-Flags:                           esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs te vx
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i
 0,0,0,0,,0,0,0,0
 1,1,1,0,,1,1,1,1
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i
 0,0,0,0,,0,0,0,0
 1,1,1,0,,1,1,1,1
index 5242b30be2853854e798cea86a15cb830fc3ee4d..da5d9abd37407de4a83f6bf92c91499686e6f48e 100644 (file)
@@ -1,22 +1,22 @@
 CPU op-mode(s):      32-bit, 64-bit
 CPU(s):              4
 On-line CPU(s) list: 0-3
+Vendor ID:           IBM/S390
+Machine type:        2817
 Thread(s) per core:  1
 Core(s) per socket:  1
 Socket(s) per book:  1
 Book(s):             4
-Vendor ID:           IBM/S390
-Machine type:        2817
 BogoMIPS:            14367.00
+Dispatching mode:    horizontal
+Flags:               esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
 Hypervisor:          z/VM 6.1.0
 Hypervisor vendor:   IBM
 Virtualization type: full
-Dispatching mode:    horizontal
-Flags:               esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 0,0,0,
 1,1,1,
@@ -25,7 +25,7 @@ Flags:               esan3 zarch stfle msa ldisp eimm dfp etf3eh highgprs
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 0,0,-,
 1,0,-,
index a12c136bc42f6d5f5efcd388380cbaec72d87ea9..a9a3c6b5ba1879dd9d2ace93e5ffd1bc4d7b1c1b 100644 (file)
@@ -1,15 +1,15 @@
 CPU op-mode(s):      32-bit, 64-bit
 CPU(s):              6
 On-line CPU(s) list: 6,7,10,11,14,15
+Model name:          TI UltraSparc II  (BlackBird)
 Thread(s) per core:  1
 Core(s) per socket:  1
 Socket(s):           6
-Model name:          TI UltraSparc II  (BlackBird)
 Flags:               sun4u
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 6,0,0,
 7,1,1,
@@ -20,7 +20,7 @@ Flags:               sun4u
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node
 6,0,-,
 7,0,-,
index c0969c9f13b60bf796da34f988522388b89bcfb4..64bde98d5f2506119a3b09054987ceb0160c2d93 100644 (file)
@@ -2,37 +2,35 @@ CPU op-mode(s):      32-bit, 64-bit
 Address sizes:       36 bits physical, 48 bits virtual
 CPU(s):              2
 On-line CPU(s) list: 0,1
-Thread(s) per core:  1
-Core(s) per socket:  2
-Socket(s):           1
-NUMA node(s):        1
 Vendor ID:           GenuineIntel
+Model name:          Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz
 CPU family:          6
 Model:               58
-Model name:          Intel(R) Core(TM) i5-3317U CPU @ 1.70GHz
+Thread(s) per core:  1
+Core(s) per socket:  2
+Socket(s):           1
 Stepping:            9
-CPU MHz:             1600.000
 CPU max MHz:         3800.0000
 CPU min MHz:         1600.0000
 BogoMIPS:            3355.62
+Flags:               fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx rdtscp lm constant_tsc rep_good nopl pni ssse3 lahf_lm
 Hypervisor vendor:   Oracle
 Virtualization type: full
 L1d cache:           64 KiB
-L1d cache:           64 KiB
 L2d cache:           6 MiB
+NUMA node(s):        1
 NUMA node0 CPU(s):   0,1
-Flags:               fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx rdtscp lm constant_tsc rep_good nopl pni ssse3 lahf_lm
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1d,L2d
-0,0,0,0,,0,0,0
-1,1,0,0,,1,1,0
+# starting usually from zero.
+# CPU,Core,Socket,Node,,L1d,L2d
+0,0,0,0,,0,0
+1,1,0,0,,1,0
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
-# CPU,Core,Socket,Node,,L1d,L1d,L2d
-0,0,0,0,,0,0,0
-1,1,0,0,,1,1,0
+# starting usually from zero.
+# CPU,Core,Socket,Node,,L1d,L2d
+0,0,0,0,,0,0
+1,1,0,0,,1,0
index 2b68db2772f1d185c5ea136307a3204c375828e7..891a0606e7fdea8235898a776b0ea33e58e358b8 100644 (file)
@@ -2,25 +2,25 @@ CPU op-mode(s):                  32-bit, 64-bit
 Address sizes:                   48 bits physical, 48 bits virtual
 CPU(s):                          16
 On-line CPU(s) list:             0-15
-Thread(s) per core:              2
-Core(s) per socket:              4
-Socket(s):                       2
-NUMA node(s):                    4
 Vendor ID:                       AuthenticAMD
+Model name:                      AMD Opteron(tm) Processor 6328
 CPU family:                      21
 Model:                           2
-Model name:                      AMD Opteron(tm) Processor 6328
+Thread(s) per core:              2
+Core(s) per socket:              4
+Socket(s):                       2
 Stepping:                        0
 Frequency boost:                 enabled
-CPU MHz:                         1605.776
 CPU max MHz:                     3200.0000
 CPU min MHz:                     1400.0000
 BogoMIPS:                        6399.69
+Flags:                           fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid amd_dcm aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 popcnt aes xsave avx f16c lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs xop skinit wdt lwp fma4 tce nodeid_msr tbm topoext perfctr_core perfctr_nb cpb hw_pstate ssbd ibpb vmmcall bmi1 arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold
 Virtualization:                  AMD-V
-L1d cache:                       128 KiB
+L1d cache:                       256 KiB
 L1i cache:                       512 KiB
 L2 cache:                        16 MiB
 L3 cache:                        24 MiB
+NUMA node(s):                    4
 NUMA node0 CPU(s):               0-3
 NUMA node1 CPU(s):               4-7
 NUMA node2 CPU(s):               8-11
@@ -31,46 +31,45 @@ Vulnerability Meltdown:          Not affected
 Vulnerability Spec store bypass: Mitigation; Speculative Store Bypass disabled via prctl and seccomp
 Vulnerability Spectre v1:        Mitigation; __user pointer sanitization
 Vulnerability Spectre v2:        Mitigation; Full AMD retpoline, IBPB conditional, STIBP disabled, RSB filling
-Flags:                           fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid amd_dcm aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 popcnt aes xsave avx f16c lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw ibs xop skinit wdt fma4 tce nodeid_msr tbm topoext perfctr_core perfctr_nb cpb hw_pstate ssbd ibpb vmmcall bmi1 arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,0,0,0,,1,0,0,0
-2,1,0,0,,2,1,1,0
-3,1,0,0,,3,1,1,0
-4,2,0,1,,4,2,2,1
-5,2,0,1,,5,2,2,1
-6,3,0,1,,6,3,3,1
-7,3,0,1,,7,3,3,1
-8,4,1,2,,8,4,4,2
-9,4,1,2,,9,4,4,2
-10,5,1,2,,10,5,5,2
-11,5,1,2,,11,5,5,2
-12,6,1,3,,12,6,6,3
-13,6,1,3,,13,6,6,3
-14,7,1,3,,14,7,7,3
-15,7,1,3,,15,7,7,3
+0,0,0,0,,32,16,16,8
+1,0,0,0,,33,16,16,8
+2,1,0,0,,34,17,17,8
+3,1,0,0,,35,17,17,8
+4,2,0,1,,36,18,18,9
+5,2,0,1,,37,18,18,9
+6,3,0,1,,38,19,19,9
+7,3,0,1,,39,19,19,9
+8,4,1,2,,64,32,32,16
+9,4,1,2,,65,32,32,16
+10,5,1,2,,66,33,33,16
+11,5,1,2,,67,33,33,16
+12,6,1,3,,68,34,34,17
+13,6,1,3,,69,34,34,17
+14,7,1,3,,70,35,35,17
+15,7,1,3,,71,35,35,17
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
-0,0,0,0,,0,0,0,0
-1,1,0,0,,1,0,0,0
-2,2,0,0,,2,1,1,0
-3,3,0,0,,3,1,1,0
-4,0,0,1,,4,2,2,1
-5,1,0,1,,5,2,2,1
-6,2,0,1,,6,3,3,1
-7,3,0,1,,7,3,3,1
-8,0,1,2,,8,4,4,2
-9,1,1,2,,9,4,4,2
-10,2,1,2,,10,5,5,2
-11,3,1,2,,11,5,5,2
-12,0,1,3,,12,6,6,3
-13,1,1,3,,13,6,6,3
-14,2,1,3,,14,7,7,3
-15,3,1,3,,15,7,7,3
+0,0,0,0,,32,16,16,8
+1,1,0,0,,33,16,16,8
+2,2,0,0,,34,17,17,8
+3,3,0,0,,35,17,17,8
+4,0,0,1,,36,18,18,9
+5,1,0,1,,37,18,18,9
+6,2,0,1,,38,19,19,9
+7,3,0,1,,39,19,19,9
+8,0,1,2,,64,32,32,16
+9,1,1,2,,65,32,32,16
+10,2,1,2,,66,33,33,16
+11,3,1,2,,67,33,33,16
+12,0,1,3,,68,34,34,17
+13,1,1,3,,69,34,34,17
+14,2,1,3,,70,35,35,17
+15,3,1,3,,71,35,35,17
index 75704f03777f9f362f763b5b3a752ea0e4795c16..c43822af875923948bf87ba4802e7140bed183fd 100644 (file)
@@ -2,32 +2,31 @@ CPU op-mode(s):      32-bit, 64-bit
 Address sizes:       44 bits physical, 48 bits virtual
 CPU(s):              64
 On-line CPU(s) list: 0-63
-Thread(s) per core:  2
-Core(s) per socket:  8
-Socket(s):           4
-NUMA node(s):        3
 Vendor ID:           GenuineIntel
+Model name:          Intel(R) Xeon(R) CPU           X7550  @ 2.00GHz
 CPU family:          6
 Model:               46
-Model name:          Intel(R) Xeon(R) CPU           X7550  @ 2.00GHz
+Thread(s) per core:  2
+Core(s) per socket:  8
+Socket(s):           4
 Stepping:            6
-CPU MHz:             1064.000
 CPU max MHz:         1996.0000
 CPU min MHz:         1064.0000
 BogoMIPS:            3990.31
+Flags:               fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni dtes64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 x2apic popcnt lahf_lm ida epb dts tpr_shadow vnmi flexpriority ept vpid
 Virtualization:      VT-x
 L1d cache:           1 MiB
 L1i cache:           1 MiB
 L2 cache:            8 MiB
 L3 cache:            72 MiB
+NUMA node(s):        3
 NUMA node0 CPU(s):   0,2,4,6,8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62
 NUMA node2 CPU(s):   1,5,9,13,17,21,25,29,33,37,41,45,49,53,57,61
 NUMA node3 CPU(s):   3,7,11,15,19,23,27,31,35,39,43,47,51,55,59,63
-Flags:               fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni dtes64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 x2apic popcnt lahf_lm ida epb dts tpr_shadow vnmi flexpriority ept vpid
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
 1,1,1,2,,1,1,1,1
@@ -96,7 +95,7 @@ Flags:               fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov p
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
 1,0,2,2,,1,1,1,1
index f62bc3febc5b62221cb1cd62639ae5a9af5cba43..a3c0e5cd69a8b77f761c098ddb08b730781d39bd 100644 (file)
@@ -2,30 +2,29 @@ CPU op-mode(s):      32-bit, 64-bit
 Address sizes:       36 bits physical, 48 bits virtual
 CPU(s):              4
 On-line CPU(s) list: 0-3
-Thread(s) per core:  2
-Core(s) per socket:  2
-Socket(s):           1
-NUMA node(s):        1
 Vendor ID:           GenuineIntel
+Model name:          Intel(R) Core(TM) i5 CPU       M 560  @ 2.67GHz
 CPU family:          6
 Model:               37
-Model name:          Intel(R) Core(TM) i5 CPU       M 560  @ 2.67GHz
+Thread(s) per core:  2
+Core(s) per socket:  2
+Socket(s):           1
 Stepping:            5
-CPU MHz:             1199.000
 CPU max MHz:         2667.0000
 CPU min MHz:         1199.0000
 BogoMIPS:            5319.92
+Flags:               fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 popcnt aes lahf_lm ida arat dts tpr_shadow vnmi flexpriority ept vpid
 Virtualization:      VT-x
 L1d cache:           64 KiB
 L1i cache:           64 KiB
 L2 cache:            512 KiB
 L3 cache:            3 MiB
+NUMA node(s):        1
 NUMA node0 CPU(s):   0-3
-Flags:               fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good nopl xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 popcnt aes lahf_lm ida arat dts tpr_shadow vnmi flexpriority ept vpid
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
 1,1,0,0,,1,1,1,0
@@ -34,7 +33,7 @@ Flags:               fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cm
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
 1,2,0,0,,1,1,1,0
index 8c1b1030bd6a293106fc9c4a2d372fde7ba0aae6..3f59d976e8a6dd32385344c3a8a2150b6b2bb8b6 100644 (file)
@@ -2,25 +2,25 @@ CPU op-mode(s):                  32-bit, 64-bit
 Address sizes:                   48 bits physical, 48 bits virtual
 CPU(s):                          96
 On-line CPU(s) list:             0-95
-Thread(s) per core:              2
-Core(s) per socket:              24
-Socket(s):                       2
-NUMA node(s):                    8
 Vendor ID:                       AuthenticAMD
+Model name:                      AMD EPYC 7451 24-Core Processor
 CPU family:                      23
 Model:                           1
-Model name:                      AMD EPYC 7451 24-Core Processor
+Thread(s) per core:              2
+Core(s) per socket:              24
+Socket(s):                       2
 Stepping:                        2
 Frequency boost:                 enabled
-CPU MHz:                         2894.214
 CPU max MHz:                     2300.0000
 CPU min MHz:                     1200.0000
 BogoMIPS:                        4590.83
+Flags:                           fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid amd_dcm aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb hw_pstate ssbd ibpb vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf xsaveerptr arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif overflow_recov succor smca
 Virtualization:                  AMD-V
 L1d cache:                       1.5 MiB
 L1i cache:                       3 MiB
 L2 cache:                        24 MiB
 L3 cache:                        128 MiB
+NUMA node(s):                    8
 NUMA node0 CPU(s):               0-5,48-53
 NUMA node1 CPU(s):               6-11,54-59
 NUMA node2 CPU(s):               12-17,60-65
@@ -34,206 +34,205 @@ Vulnerability Meltdown:          Not affected
 Vulnerability Spec store bypass: Mitigation; Speculative Store Bypass disabled via prctl and seccomp
 Vulnerability Spectre v1:        Mitigation; __user pointer sanitization
 Vulnerability Spectre v2:        Mitigation; Full AMD retpoline, IBPB conditional, STIBP disabled, RSB filling
-Flags:                           fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush mmx fxsr sse sse2 ht syscall nx mmxext fxsr_opt pdpe1gb rdtscp lm constant_tsc rep_good nopl nonstop_tsc cpuid extd_apicid amd_dcm aperfmperf pni pclmulqdq monitor ssse3 fma cx16 sse4_1 sse4_2 movbe popcnt aes xsave avx f16c rdrand lahf_lm cmp_legacy svm extapic cr8_legacy abm sse4a misalignsse 3dnowprefetch osvw skinit wdt tce topoext perfctr_core perfctr_nb bpext perfctr_llc mwaitx cpb hw_pstate ssbd ibpb vmmcall fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 xsaves clzero irperf xsaveerptr arat npt lbrv svm_lock nrip_save tsc_scale vmcb_clean flushbyasid decodeassists pausefilter pfthreshold avic v_vmsave_vmload vgif overflow_recov succor smca
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
 1,1,0,0,,1,1,1,0
 2,2,0,0,,2,2,2,0
-3,3,0,0,,3,3,3,1
-4,4,0,0,,4,4,4,1
-5,5,0,0,,5,5,5,1
-6,6,0,1,,6,6,6,2
-7,7,0,1,,7,7,7,2
-8,8,0,1,,8,8,8,2
-9,9,0,1,,9,9,9,3
-10,10,0,1,,10,10,10,3
-11,11,0,1,,11,11,11,3
-12,12,0,2,,12,12,12,4
-13,13,0,2,,13,13,13,4
-14,14,0,2,,14,14,14,4
-15,15,0,2,,15,15,15,5
-16,16,0,2,,16,16,16,5
-17,17,0,2,,17,17,17,5
-18,18,0,3,,18,18,18,6
-19,19,0,3,,19,19,19,6
-20,20,0,3,,20,20,20,6
-21,21,0,3,,21,21,21,7
-22,22,0,3,,22,22,22,7
-23,23,0,3,,23,23,23,7
-24,24,1,4,,24,24,24,8
-25,25,1,4,,25,25,25,8
-26,26,1,4,,26,26,26,8
-27,27,1,4,,27,27,27,9
-28,28,1,4,,28,28,28,9
-29,29,1,4,,29,29,29,9
-30,30,1,5,,30,30,30,10
-31,31,1,5,,31,31,31,10
-32,32,1,5,,32,32,32,10
-33,33,1,5,,33,33,33,11
-34,34,1,5,,34,34,34,11
-35,35,1,5,,35,35,35,11
-36,36,1,6,,36,36,36,12
-37,37,1,6,,37,37,37,12
-38,38,1,6,,38,38,38,12
-39,39,1,6,,39,39,39,13
-40,40,1,6,,40,40,40,13
-41,41,1,6,,41,41,41,13
-42,42,1,7,,42,42,42,14
-43,43,1,7,,43,43,43,14
-44,44,1,7,,44,44,44,14
-45,45,1,7,,45,45,45,15
-46,46,1,7,,46,46,46,15
-47,47,1,7,,47,47,47,15
+3,3,0,0,,4,4,4,1
+4,4,0,0,,5,5,5,1
+5,5,0,0,,6,6,6,1
+6,6,0,1,,8,8,8,2
+7,7,0,1,,9,9,9,2
+8,8,0,1,,10,10,10,2
+9,9,0,1,,12,12,12,3
+10,10,0,1,,13,13,13,3
+11,11,0,1,,14,14,14,3
+12,12,0,2,,16,16,16,4
+13,13,0,2,,17,17,17,4
+14,14,0,2,,18,18,18,4
+15,15,0,2,,20,20,20,5
+16,16,0,2,,21,21,21,5
+17,17,0,2,,22,22,22,5
+18,18,0,3,,24,24,24,6
+19,19,0,3,,25,25,25,6
+20,20,0,3,,26,26,26,6
+21,21,0,3,,28,28,28,7
+22,22,0,3,,29,29,29,7
+23,23,0,3,,30,30,30,7
+24,24,1,4,,32,32,32,8
+25,25,1,4,,33,33,33,8
+26,26,1,4,,34,34,34,8
+27,27,1,4,,36,36,36,9
+28,28,1,4,,37,37,37,9
+29,29,1,4,,38,38,38,9
+30,30,1,5,,40,40,40,10
+31,31,1,5,,41,41,41,10
+32,32,1,5,,42,42,42,10
+33,33,1,5,,44,44,44,11
+34,34,1,5,,45,45,45,11
+35,35,1,5,,46,46,46,11
+36,36,1,6,,48,48,48,12
+37,37,1,6,,49,49,49,12
+38,38,1,6,,50,50,50,12
+39,39,1,6,,52,52,52,13
+40,40,1,6,,53,53,53,13
+41,41,1,6,,54,54,54,13
+42,42,1,7,,56,56,56,14
+43,43,1,7,,57,57,57,14
+44,44,1,7,,58,58,58,14
+45,45,1,7,,60,60,60,15
+46,46,1,7,,61,61,61,15
+47,47,1,7,,62,62,62,15
 48,0,0,0,,0,0,0,0
 49,1,0,0,,1,1,1,0
 50,2,0,0,,2,2,2,0
-51,3,0,0,,3,3,3,1
-52,4,0,0,,4,4,4,1
-53,5,0,0,,5,5,5,1
-54,6,0,1,,6,6,6,2
-55,7,0,1,,7,7,7,2
-56,8,0,1,,8,8,8,2
-57,9,0,1,,9,9,9,3
-58,10,0,1,,10,10,10,3
-59,11,0,1,,11,11,11,3
-60,12,0,2,,12,12,12,4
-61,13,0,2,,13,13,13,4
-62,14,0,2,,14,14,14,4
-63,15,0,2,,15,15,15,5
-64,16,0,2,,16,16,16,5
-65,17,0,2,,17,17,17,5
-66,18,0,3,,18,18,18,6
-67,19,0,3,,19,19,19,6
-68,20,0,3,,20,20,20,6
-69,21,0,3,,21,21,21,7
-70,22,0,3,,22,22,22,7
-71,23,0,3,,23,23,23,7
-72,24,1,4,,24,24,24,8
-73,25,1,4,,25,25,25,8
-74,26,1,4,,26,26,26,8
-75,27,1,4,,27,27,27,9
-76,28,1,4,,28,28,28,9
-77,29,1,4,,29,29,29,9
-78,30,1,5,,30,30,30,10
-79,31,1,5,,31,31,31,10
-80,32,1,5,,32,32,32,10
-81,33,1,5,,33,33,33,11
-82,34,1,5,,34,34,34,11
-83,35,1,5,,35,35,35,11
-84,36,1,6,,36,36,36,12
-85,37,1,6,,37,37,37,12
-86,38,1,6,,38,38,38,12
-87,39,1,6,,39,39,39,13
-88,40,1,6,,40,40,40,13
-89,41,1,6,,41,41,41,13
-90,42,1,7,,42,42,42,14
-91,43,1,7,,43,43,43,14
-92,44,1,7,,44,44,44,14
-93,45,1,7,,45,45,45,15
-94,46,1,7,,46,46,46,15
-95,47,1,7,,47,47,47,15
+51,3,0,0,,4,4,4,1
+52,4,0,0,,5,5,5,1
+53,5,0,0,,6,6,6,1
+54,6,0,1,,8,8,8,2
+55,7,0,1,,9,9,9,2
+56,8,0,1,,10,10,10,2
+57,9,0,1,,12,12,12,3
+58,10,0,1,,13,13,13,3
+59,11,0,1,,14,14,14,3
+60,12,0,2,,16,16,16,4
+61,13,0,2,,17,17,17,4
+62,14,0,2,,18,18,18,4
+63,15,0,2,,20,20,20,5
+64,16,0,2,,21,21,21,5
+65,17,0,2,,22,22,22,5
+66,18,0,3,,24,24,24,6
+67,19,0,3,,25,25,25,6
+68,20,0,3,,26,26,26,6
+69,21,0,3,,28,28,28,7
+70,22,0,3,,29,29,29,7
+71,23,0,3,,30,30,30,7
+72,24,1,4,,32,32,32,8
+73,25,1,4,,33,33,33,8
+74,26,1,4,,34,34,34,8
+75,27,1,4,,36,36,36,9
+76,28,1,4,,37,37,37,9
+77,29,1,4,,38,38,38,9
+78,30,1,5,,40,40,40,10
+79,31,1,5,,41,41,41,10
+80,32,1,5,,42,42,42,10
+81,33,1,5,,44,44,44,11
+82,34,1,5,,45,45,45,11
+83,35,1,5,,46,46,46,11
+84,36,1,6,,48,48,48,12
+85,37,1,6,,49,49,49,12
+86,38,1,6,,50,50,50,12
+87,39,1,6,,52,52,52,13
+88,40,1,6,,53,53,53,13
+89,41,1,6,,54,54,54,13
+90,42,1,7,,56,56,56,14
+91,43,1,7,,57,57,57,14
+92,44,1,7,,58,58,58,14
+93,45,1,7,,60,60,60,15
+94,46,1,7,,61,61,61,15
+95,47,1,7,,62,62,62,15
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID
-# starting from zero.
+# starting usually from zero.
 # CPU,Core,Socket,Node,,L1d,L1i,L2,L3
 0,0,0,0,,0,0,0,0
 1,1,0,0,,1,1,1,0
 2,2,0,0,,2,2,2,0
-3,4,0,0,,3,3,3,1
-4,5,0,0,,4,4,4,1
-5,6,0,0,,5,5,5,1
-6,8,0,1,,6,6,6,2
-7,9,0,1,,7,7,7,2
-8,10,0,1,,8,8,8,2
-9,12,0,1,,9,9,9,3
-10,13,0,1,,10,10,10,3
-11,14,0,1,,11,11,11,3
-12,16,0,2,,12,12,12,4
-13,17,0,2,,13,13,13,4
-14,18,0,2,,14,14,14,4
-15,20,0,2,,15,15,15,5
-16,21,0,2,,16,16,16,5
-17,22,0,2,,17,17,17,5
-18,24,0,3,,18,18,18,6
-19,25,0,3,,19,19,19,6
-20,26,0,3,,20,20,20,6
-21,28,0,3,,21,21,21,7
-22,29,0,3,,22,22,22,7
-23,30,0,3,,23,23,23,7
-24,0,1,4,,24,24,24,8
-25,1,1,4,,25,25,25,8
-26,2,1,4,,26,26,26,8
-27,4,1,4,,27,27,27,9
-28,5,1,4,,28,28,28,9
-29,6,1,4,,29,29,29,9
-30,8,1,5,,30,30,30,10
-31,9,1,5,,31,31,31,10
-32,10,1,5,,32,32,32,10
-33,12,1,5,,33,33,33,11
-34,13,1,5,,34,34,34,11
-35,14,1,5,,35,35,35,11
-36,16,1,6,,36,36,36,12
-37,17,1,6,,37,37,37,12
-38,18,1,6,,38,38,38,12
-39,20,1,6,,39,39,39,13
-40,21,1,6,,40,40,40,13
-41,22,1,6,,41,41,41,13
-42,24,1,7,,42,42,42,14
-43,25,1,7,,43,43,43,14
-44,26,1,7,,44,44,44,14
-45,28,1,7,,45,45,45,15
-46,29,1,7,,46,46,46,15
-47,30,1,7,,47,47,47,15
+3,4,0,0,,4,4,4,1
+4,5,0,0,,5,5,5,1
+5,6,0,0,,6,6,6,1
+6,8,0,1,,8,8,8,2
+7,9,0,1,,9,9,9,2
+8,10,0,1,,10,10,10,2
+9,12,0,1,,12,12,12,3
+10,13,0,1,,13,13,13,3
+11,14,0,1,,14,14,14,3
+12,16,0,2,,16,16,16,4
+13,17,0,2,,17,17,17,4
+14,18,0,2,,18,18,18,4
+15,20,0,2,,20,20,20,5
+16,21,0,2,,21,21,21,5
+17,22,0,2,,22,22,22,5
+18,24,0,3,,24,24,24,6
+19,25,0,3,,25,25,25,6
+20,26,0,3,,26,26,26,6
+21,28,0,3,,28,28,28,7
+22,29,0,3,,29,29,29,7
+23,30,0,3,,30,30,30,7
+24,0,1,4,,32,32,32,8
+25,1,1,4,,33,33,33,8
+26,2,1,4,,34,34,34,8
+27,4,1,4,,36,36,36,9
+28,5,1,4,,37,37,37,9
+29,6,1,4,,38,38,38,9
+30,8,1,5,,40,40,40,10
+31,9,1,5,,41,41,41,10
+32,10,1,5,,42,42,42,10
+33,12,1,5,,44,44,44,11
+34,13,1,5,,45,45,45,11
+35,14,1,5,,46,46,46,11
+36,16,1,6,,48,48,48,12
+37,17,1,6,,49,49,49,12
+38,18,1,6,,50,50,50,12
+39,20,1,6,,52,52,52,13
+40,21,1,6,,53,53,53,13
+41,22,1,6,,54,54,54,13
+42,24,1,7,,56,56,56,14
+43,25,1,7,,57,57,57,14
+44,26,1,7,,58,58,58,14
+45,28,1,7,,60,60,60,15
+46,29,1,7,,61,61,61,15
+47,30,1,7,,62,62,62,15
 48,0,0,0,,0,0,0,0
 49,1,0,0,,1,1,1,0
 50,2,0,0,,2,2,2,0
-51,4,0,0,,3,3,3,1
-52,5,0,0,,4,4,4,1
-53,6,0,0,,5,5,5,1
-54,8,0,1,,6,6,6,2
-55,9,0,1,,7,7,7,2
-56,10,0,1,,8,8,8,2
-57,12,0,1,,9,9,9,3
-58,13,0,1,,10,10,10,3
-59,14,0,1,,11,11,11,3
-60,16,0,2,,12,12,12,4
-61,17,0,2,,13,13,13,4
-62,18,0,2,,14,14,14,4
-63,20,0,2,,15,15,15,5
-64,21,0,2,,16,16,16,5
-65,22,0,2,,17,17,17,5
-66,24,0,3,,18,18,18,6
-67,25,0,3,,19,19,19,6
-68,26,0,3,,20,20,20,6
-69,28,0,3,,21,21,21,7
-70,29,0,3,,22,22,22,7
-71,30,0,3,,23,23,23,7
-72,0,1,4,,24,24,24,8
-73,1,1,4,,25,25,25,8
-74,2,1,4,,26,26,26,8
-75,4,1,4,,27,27,27,9
-76,5,1,4,,28,28,28,9
-77,6,1,4,,29,29,29,9
-78,8,1,5,,30,30,30,10
-79,9,1,5,,31,31,31,10
-80,10,1,5,,32,32,32,10
-81,12,1,5,,33,33,33,11
-82,13,1,5,,34,34,34,11
-83,14,1,5,,35,35,35,11
-84,16,1,6,,36,36,36,12
-85,17,1,6,,37,37,37,12
-86,18,1,6,,38,38,38,12
-87,20,1,6,,39,39,39,13
-88,21,1,6,,40,40,40,13
-89,22,1,6,,41,41,41,13
-90,24,1,7,,42,42,42,14
-91,25,1,7,,43,43,43,14
-92,26,1,7,,44,44,44,14
-93,28,1,7,,45,45,45,15
-94,29,1,7,,46,46,46,15
-95,30,1,7,,47,47,47,15
+51,4,0,0,,4,4,4,1
+52,5,0,0,,5,5,5,1
+53,6,0,0,,6,6,6,1
+54,8,0,1,,8,8,8,2
+55,9,0,1,,9,9,9,2
+56,10,0,1,,10,10,10,2
+57,12,0,1,,12,12,12,3
+58,13,0,1,,13,13,13,3
+59,14,0,1,,14,14,14,3
+60,16,0,2,,16,16,16,4
+61,17,0,2,,17,17,17,4
+62,18,0,2,,18,18,18,4
+63,20,0,2,,20,20,20,5
+64,21,0,2,,21,21,21,5
+65,22,0,2,,22,22,22,5
+66,24,0,3,,24,24,24,6
+67,25,0,3,,25,25,25,6
+68,26,0,3,,26,26,26,6
+69,28,0,3,,28,28,28,7
+70,29,0,3,,29,29,29,7
+71,30,0,3,,30,30,30,7
+72,0,1,4,,32,32,32,8
+73,1,1,4,,33,33,33,8
+74,2,1,4,,34,34,34,8
+75,4,1,4,,36,36,36,9
+76,5,1,4,,37,37,37,9
+77,6,1,4,,38,38,38,9
+78,8,1,5,,40,40,40,10
+79,9,1,5,,41,41,41,10
+80,10,1,5,,42,42,42,10
+81,12,1,5,,44,44,44,11
+82,13,1,5,,45,45,45,11
+83,14,1,5,,46,46,46,11
+84,16,1,6,,48,48,48,12
+85,17,1,6,,49,49,49,12
+86,18,1,6,,50,50,50,12
+87,20,1,6,,52,52,52,13
+88,21,1,6,,53,53,53,13
+89,22,1,6,,54,54,54,13
+90,24,1,7,,56,56,56,14
+91,25,1,7,,57,57,57,14
+92,26,1,7,,58,58,58,14
+93,28,1,7,,60,60,60,15
+94,29,1,7,,61,61,61,15
+95,30,1,7,,62,62,62,15