tests: update lscpu output

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/expected/lscpu/lscpu-ppc64-POWER7 b/tests/expected/lscpu/lscpu-ppc64-POWER7
index 7e44888593aebc0fe6c0d6b147205921c02bfca9..49b575e140a896129bd248339f4d736d05d8a71b 100644 (file)
--- a/tests/expected/lscpu/lscpu-ppc64-POWER7
+++ b/tests/expected/lscpu/lscpu-ppc64-POWER7
@@ -5,8 +5,8 @@ Model:               2.1 (pvr 003f 0201)
 Thread(s) per core:  4
 Core(s) per socket:  1
 Socket(s):           4
-L1d cache:           128 KiB
-L1i cache:           128 KiB
+L1d cache:           128 KiB (4 instances)
+L1i cache:           128 KiB (4 instances)
 NUMA node(s):        1
 NUMA node0 CPU(s):   0-15
 

diff --git a/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu b/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu
index 1af9427069935300a480a671b03a665784dab996..fcb024a2e99d389f8b73010c9b378a51b9e4d89b 100644 (file)
--- a/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu
+++ b/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu
@@ -7,8 +7,8 @@ Core(s) per socket:  1
 Socket(s):           16
 Hypervisor vendor:   pHyp
 Virtualization type: para
-L1d cache:           512 KiB
-L1i cache:           512 KiB
+L1d cache:           512 KiB (16 instances)
+L1i cache:           512 KiB (16 instances)
 NUMA node(s):        2
 NUMA node0 CPU(s):   0-63
 NUMA node1 CPU(s):   

diff --git a/tests/expected/lscpu/lscpu-s390-lpar-drawer b/tests/expected/lscpu/lscpu-s390-lpar-drawer
index 8edb07deaefc723ab13cd66032d3e7b7b5ea5b88..099a5bb5842c7eb8ad8a78badabe49071fb02d2f 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-lpar-drawer
+++ b/tests/expected/lscpu/lscpu-s390-lpar-drawer
@@ -16,10 +16,10 @@ Flags:               esan3 zarch stfle msa ldisp eimm dfp edat etf3eh highgprs t
 Hypervisor:          PR/SM
 Hypervisor vendor:   IBM
 Virtualization type: full
-L1d cache:           1 MiB
-L1i cache:           768 KiB
-L2d cache:           16 MiB
-L2i cache:           16 MiB
+L1d cache:           1 MiB (8 instances)
+L1i cache:           768 KiB (8 instances)
+L2d cache:           16 MiB (8 instances)
+L2i cache:           16 MiB (8 instances)
 L3 cache:            64 MiB
 L4 cache:            480 MiB
 NUMA node(s):        1

diff --git a/tests/expected/lscpu/lscpu-s390-nested-virt b/tests/expected/lscpu/lscpu-s390-nested-virt
index 6b931b48a75898b4ff19a0666c0c2acd42676b57..fb413c3e9e18d74aafb77cc7ea640cd3a2ae1a5f 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-nested-virt
+++ b/tests/expected/lscpu/lscpu-s390-nested-virt
@@ -16,10 +16,10 @@ Flags:                           esan3 zarch stfle msa ldisp eimm dfp edat etf3e
 Hypervisor:                      KVM/Linux
 Hypervisor vendor:               KVM
 Virtualization type:             full
-L1d cache:                       256 KiB
-L1i cache:                       192 KiB
-L2d cache:                       4 MiB
-L2i cache:                       4 MiB
+L1d cache:                       256 KiB (2 instances)
+L1i cache:                       192 KiB (2 instances)
+L2d cache:                       4 MiB (2 instances)
+L2i cache:                       4 MiB (2 instances)
 L3 cache:                        64 MiB
 L4 cache:                        480 MiB
 NUMA node(s):                    1

diff --git a/tests/expected/lscpu/lscpu-vbox-win b/tests/expected/lscpu/lscpu-vbox-win
index 64bde98d5f2506119a3b09054987ceb0160c2d93..ab8a25c2c9659afa309e35248767822fa01f3e7d 100644 (file)
--- a/tests/expected/lscpu/lscpu-vbox-win
+++ b/tests/expected/lscpu/lscpu-vbox-win
@@ -16,8 +16,8 @@ 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
-L2d cache:           6 MiB
+L1d cache:           64 KiB (2 instances)
+L2d cache:           6 MiB (1 instance)
 NUMA node(s):        1
 NUMA node0 CPU(s):   0,1
 

diff --git a/tests/expected/lscpu/lscpu-vmware_fpe b/tests/expected/lscpu/lscpu-vmware_fpe
index 891a0606e7fdea8235898a776b0ea33e58e358b8..363bdd931d0c3c1dbf7a6be005d82b3e8ba0ee72 100644 (file)
--- a/tests/expected/lscpu/lscpu-vmware_fpe
+++ b/tests/expected/lscpu/lscpu-vmware_fpe
@@ -16,10 +16,10 @@ 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:                       256 KiB
-L1i cache:                       512 KiB
-L2 cache:                        16 MiB
-L3 cache:                        24 MiB
+L1d cache:                       256 KiB (16 instances)
+L1i cache:                       512 KiB (8 instances)
+L2 cache:                        16 MiB (8 instances)
+L3 cache:                        24 MiB (4 instances)
 NUMA node(s):                    4
 NUMA node0 CPU(s):               0-3
 NUMA node1 CPU(s):               4-7

diff --git a/tests/expected/lscpu/lscpu-x86_64-64cpu b/tests/expected/lscpu/lscpu-x86_64-64cpu
index c43822af875923948bf87ba4802e7140bed183fd..cd84ad46a82293dd353ba2e42b469adbdfc5e018 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-64cpu
+++ b/tests/expected/lscpu/lscpu-x86_64-64cpu
@@ -15,10 +15,10 @@ 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
+L1d cache:           1 MiB (32 instances)
+L1i cache:           1 MiB (32 instances)
+L2 cache:            8 MiB (32 instances)
+L3 cache:            72 MiB (4 instances)
 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

diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
index a3c0e5cd69a8b77f761c098ddb08b730781d39bd..a0a9962c788c89eb74cccebf977087a862455c20 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-dell_e4310
+++ b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
@@ -15,10 +15,10 @@ 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
+L1d cache:           64 KiB (2 instances)
+L1i cache:           64 KiB (2 instances)
+L2 cache:            512 KiB (2 instances)
+L3 cache:            3 MiB (1 instance)
 NUMA node(s):        1
 NUMA node0 CPU(s):   0-3
 

diff --git a/tests/expected/lscpu/lscpu-x86_64-epyc_7451 b/tests/expected/lscpu/lscpu-x86_64-epyc_7451
index 3f59d976e8a6dd32385344c3a8a2150b6b2bb8b6..6e5085e84b221239376f46fc317df1f2794d3eed 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-epyc_7451
+++ b/tests/expected/lscpu/lscpu-x86_64-epyc_7451
@@ -16,10 +16,10 @@ 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
+L1d cache:                       1.5 MiB (48 instances)
+L1i cache:                       3 MiB (48 instances)
+L2 cache:                        24 MiB (48 instances)
+L3 cache:                        128 MiB (16 instances)
 NUMA node(s):                    8
 NUMA node0 CPU(s):               0-5,48-53
 NUMA node1 CPU(s):               6-11,54-59