tests: update lscpu output

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

diff --git a/tests/expected/lscpu/lscpu-ppc-qemu b/tests/expected/lscpu/lscpu-ppc-qemu
index bf8e49e48c38cf1ffef68201e1ada19244853fd7..ab935e5d6ac5e4f9f96bf5745bbfccdf226cdf92 100644 (file)
--- a/tests/expected/lscpu/lscpu-ppc-qemu
+++ b/tests/expected/lscpu/lscpu-ppc-qemu
@@ -6,8 +6,6 @@ Socket(s):           1
 Model:               3.1 (pvr 0008 0301)
 Model name:          740/750
 BogoMIPS:            33.25
-L1d cache:           unknown size
-L1i cache:           unknown size
 
 # The following is the parsable format, which can be fed to other
 # programs. Each different item in every column has an unique ID

diff --git a/tests/expected/lscpu/lscpu-ppc64-POWER7 b/tests/expected/lscpu/lscpu-ppc64-POWER7
index 8c4dca0f04ac914431936d67da102f54f0ade1cb..f1668a40345db53595b0c1b602cf8b4836cabcfb 100644 (file)
--- a/tests/expected/lscpu/lscpu-ppc64-POWER7
+++ b/tests/expected/lscpu/lscpu-ppc64-POWER7
@@ -6,8 +6,8 @@ Socket(s):           4
 NUMA node(s):        1
 Model:               2.1 (pvr 003f 0201)
 Model name:          POWER7 (architected), altivec supported
-L1d cache:           32K
-L1i cache:           32K
+L1d cache:           128 KiB
+L1i cache:           128 KiB
 NUMA node0 CPU(s):   0-15
 
 # The following is the parsable format, which can be fed to other

diff --git a/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu b/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu
index 2157b1776af64b75ceff5addb491cc1001d878ec..fdda27cb327730a2246157bf90f253d38a03f05f 100644 (file)
--- a/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu
+++ b/tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu
@@ -8,8 +8,8 @@ Model:               2.1 (pvr 003f 0201)
 Model name:          POWER7 (architected), altivec supported
 Hypervisor vendor:   pHyp
 Virtualization type: para
-L1d cache:           32K
-L1i cache:           32K
+L1d cache:           512 KiB
+L1i cache:           512 KiB
 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 d223009d6d1403f99f1110465bd9a16675796058..d2064eeb294cbb30dbfadee1e7d08ff59a8e3e0f 100644 (file)
--- a/tests/expected/lscpu/lscpu-s390-lpar-drawer
+++ b/tests/expected/lscpu/lscpu-s390-lpar-drawer
@@ -16,10 +16,10 @@ Hypervisor:          PR/SM
 Hypervisor vendor:   IBM
 Virtualization type: full
 Dispatching mode:    horizontal
-L1d cache:           128K
-L1i cache:           96K
-L2d cache:           2048K
-L2i cache:           2048K
+L1d cache:           1 MiB
+L1i cache:           768 KiB
+L2d cache:           16 MiB
+L2i cache:           16 MiB
 L3 cache:            65536K
 L4 cache:            491520K
 NUMA node0 CPU(s):   0-140

diff --git a/tests/expected/lscpu/lscpu-vbox-win b/tests/expected/lscpu/lscpu-vbox-win
index 701a578821b153f12e0b468dfa97dac0688faae5..c0969c9f13b60bf796da34f988522388b89bcfb4 100644 (file)
--- a/tests/expected/lscpu/lscpu-vbox-win
+++ b/tests/expected/lscpu/lscpu-vbox-win
@@ -17,9 +17,9 @@ CPU min MHz:         1600.0000
 BogoMIPS:            3355.62
 Hypervisor vendor:   Oracle
 Virtualization type: full
-L1d cache:           32K
-L1d cache:           32K
-L2d cache:           6144K
+L1d cache:           64 KiB
+L1d cache:           64 KiB
+L2d cache:           6 MiB
 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
 

diff --git a/tests/expected/lscpu/lscpu-x86_64-64cpu b/tests/expected/lscpu/lscpu-x86_64-64cpu
index 91809241c4b5f59803de7bcf10dde30bb1e1b3e9..75704f03777f9f362f763b5b3a752ea0e4795c16 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-64cpu
+++ b/tests/expected/lscpu/lscpu-x86_64-64cpu
@@ -16,10 +16,10 @@ CPU max MHz:         1996.0000
 CPU min MHz:         1064.0000
 BogoMIPS:            3990.31
 Virtualization:      VT-x
-L1d cache:           32K
-L1i cache:           32K
-L2 cache:            256K
-L3 cache:            18432K
+L1d cache:           1 MiB
+L1i cache:           1 MiB
+L2 cache:            8 MiB
+L3 cache:            72 MiB
 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

diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
index 0eca1440cd750acf755e549a03e8f85e992db2b3..f62bc3febc5b62221cb1cd62639ae5a9af5cba43 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-dell_e4310
+++ b/tests/expected/lscpu/lscpu-x86_64-dell_e4310
@@ -16,10 +16,10 @@ CPU max MHz:         2667.0000
 CPU min MHz:         1199.0000
 BogoMIPS:            5319.92
 Virtualization:      VT-x
-L1d cache:           32K
-L1i cache:           32K
-L2 cache:            256K
-L3 cache:            3072K
+L1d cache:           64 KiB
+L1i cache:           64 KiB
+L2 cache:            512 KiB
+L3 cache:            3 MiB
 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
 

diff --git a/tests/expected/lscpu/lscpu-x86_64-epyc_7451 b/tests/expected/lscpu/lscpu-x86_64-epyc_7451
index a4af6ea0b9b9e19d366f92dfa81a8aca67ac6ad6..a336e0ad5720907568986e6e3590e4088001f2c5 100644 (file)
--- a/tests/expected/lscpu/lscpu-x86_64-epyc_7451
+++ b/tests/expected/lscpu/lscpu-x86_64-epyc_7451
@@ -17,10 +17,10 @@ CPU max MHz:         2300.0000
 CPU min MHz:         1200.0000
 BogoMIPS:            4590.83
 Virtualization:      AMD-V
-L1d cache:           32K
-L1i cache:           64K
-L2 cache:            512K
-L3 cache:            8192K
+L1d cache:           1.5 MiB
+L1i cache:           3 MiB
+L2 cache:            24 MiB
+L3 cache:            128 MiB
 NUMA node0 CPU(s):   0-5,48-53
 NUMA node1 CPU(s):   6-11,54-59
 NUMA node2 CPU(s):   12-17,60-65