From 1b4b184cc8e59e86d3219eaf5c15b75658bab2a9 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 19 Mar 2019 13:56:26 +0100 Subject: [PATCH] tests: update lscpu output Signed-off-by: Karel Zak --- tests/expected/lscpu/lscpu-ppc-qemu | 2 -- tests/expected/lscpu/lscpu-ppc64-POWER7 | 4 ++-- tests/expected/lscpu/lscpu-ppc64-POWER7-64cpu | 4 ++-- tests/expected/lscpu/lscpu-s390-lpar-drawer | 8 ++++---- tests/expected/lscpu/lscpu-vbox-win | 6 +++--- tests/expected/lscpu/lscpu-x86_64-64cpu | 8 ++++---- tests/expected/lscpu/lscpu-x86_64-dell_e4310 | 8 ++++---- tests/expected/lscpu/lscpu-x86_64-epyc_7451 | 8 ++++---- 8 files changed, 23 insertions(+), 25 deletions(-) diff --git a/tests/expected/lscpu/lscpu-ppc-qemu b/tests/expected/lscpu/lscpu-ppc-qemu index bf8e49e48..ab935e5d6 100644 --- 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 8c4dca0f0..f1668a403 100644 --- 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 2157b1776..fdda27cb3 100644 --- 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 d223009d6..d2064eeb2 100644 --- 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 701a57882..c0969c9f1 100644 --- 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 91809241c..75704f037 100644 --- 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 0eca1440c..f62bc3feb 100644 --- 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 a4af6ea0b..a336e0ad5 100644 --- 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