From 68975d7eb182e3b08668d79cbcb68c365f101475 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 1 Jun 2010 10:44:41 +0200 Subject: [PATCH] tests: update lscpu Signed-off-by: Karel Zak --- tests/expected/lscpu/lscpu-ia64-hpmatterhorn | 19 ++++++----- tests/expected/lscpu/lscpu-ia64-hprx1620 | 1 + tests/expected/lscpu/lscpu-ia64-pg0 | 34 +++++++++++--------- tests/expected/lscpu/lscpu-x86_64-hpdl585 | 28 +++++++++------- tests/expected/lscpu/lscpu-x86_64-ibme326m | 1 + tests/expected/lscpu/lscpu-x86_64-necem14 | 1 + 6 files changed, 48 insertions(+), 36 deletions(-) diff --git a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn index e38bf46d..e4446067 100644 --- a/tests/expected/lscpu/lscpu-ia64-hpmatterhorn +++ b/tests/expected/lscpu/lscpu-ia64-hpmatterhorn @@ -11,16 +11,19 @@ L1d cache: 16K L1i cache: 16K L2 cache: 256K L3 cache: 3072K +NUMA node0 CPU(s): 4-7 +NUMA node1 CPU(s): 0-3 +NUMA node2 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. # CPU,Core,Socket,Node,,L1d,L1i,L2,L3 -0,0,0,0,,0,0,0,0 -1,1,1,0,,1,1,1,1 -2,2,2,0,,2,2,2,2 -3,3,3,0,,3,3,3,3 -4,4,4,1,,4,4,4,4 -5,5,5,1,,5,5,5,5 -6,6,6,1,,6,6,6,6 -7,7,7,1,,7,7,7,7 +0,0,0,1,,0,0,0,0 +1,1,1,1,,1,1,1,1 +2,2,2,1,,2,2,2,2 +3,3,3,1,,3,3,3,3 +4,4,4,0,,4,4,4,4 +5,5,5,0,,5,5,5,5 +6,6,6,0,,6,6,6,6 +7,7,7,0,,7,7,7,7 diff --git a/tests/expected/lscpu/lscpu-ia64-hprx1620 b/tests/expected/lscpu/lscpu-ia64-hprx1620 index 081d8788..4812be6a 100644 --- a/tests/expected/lscpu/lscpu-ia64-hprx1620 +++ b/tests/expected/lscpu/lscpu-ia64-hprx1620 @@ -11,6 +11,7 @@ L1d cache: 16K L1i cache: 16K L2 cache: 256K L3 cache: 3072K +NUMA node0 CPU(s): 0,1 # 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-ia64-pg0 b/tests/expected/lscpu/lscpu-ia64-pg0 index 7600b808..22c4539c 100644 --- a/tests/expected/lscpu/lscpu-ia64-pg0 +++ b/tests/expected/lscpu/lscpu-ia64-pg0 @@ -12,24 +12,26 @@ L1i cache: 16K L2d cache: 256K L2i cache: 1024K L3 cache: 6144K +NUMA node0 CPU(s): 0-7 +NUMA node1 CPU(s): 8-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. # CPU,Core,Socket,Node,,L1d,L1i,L2d,L2i,L3 -0,0,0,0,,0,0,0,0,0 -1,1,0,0,,1,1,1,0,0 -2,2,1,0,,2,2,2,1,1 -3,3,1,0,,3,3,3,1,1 -4,4,2,0,,4,4,4,2,2 -5,5,2,0,,5,5,5,2,2 -6,6,3,0,,6,6,6,3,3 -7,7,3,0,,7,7,7,3,3 -8,8,4,1,,8,8,8,4,4 -9,9,4,1,,9,9,9,4,4 -10,10,5,1,,10,10,10,5,5 -11,11,5,1,,11,11,11,5,5 -12,12,6,1,,12,12,12,6,6 -13,13,6,1,,13,13,13,6,6 -14,14,7,1,,14,14,14,7,7 -15,15,7,1,,15,15,15,7,7 +0,0,0,0,,0,0,0,, +1,1,0,0,,1,1,1,, +2,2,1,0,,2,2,2,, +3,3,1,0,,3,3,3,, +4,4,2,0,,4,4,4,, +5,5,2,0,,5,5,5,, +6,6,3,0,,6,6,6,, +7,7,3,0,,7,7,7,, +8,8,4,1,,8,8,8,, +9,9,4,1,,9,9,9,, +10,10,5,1,,10,10,10,, +11,11,5,1,,11,11,11,, +12,12,6,1,,12,12,12,, +13,13,6,1,,13,13,13,, +14,14,7,1,,14,14,14,, +15,15,7,1,,15,15,15,, diff --git a/tests/expected/lscpu/lscpu-x86_64-hpdl585 b/tests/expected/lscpu/lscpu-x86_64-hpdl585 index 52bc8cb9..54a1a242 100644 --- a/tests/expected/lscpu/lscpu-x86_64-hpdl585 +++ b/tests/expected/lscpu/lscpu-x86_64-hpdl585 @@ -14,24 +14,28 @@ L1d cache: 512K L1i cache: 512K L2 cache: 512K L3 cache: 2048K +NUMA node0 CPU(s): 0,4,8,12 +NUMA node1 CPU(s): 1,5,9,13 +NUMA node2 CPU(s): 2,6,10,14 +NUMA node3 CPU(s): 3,7,11,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. # CPU,Core,Socket,Node,,L1d,L1i,L2,L3 0,0,0,0,,0,0,0,0 -1,1,0,0,,1,1,1,1 -2,2,0,0,,2,2,2,2 -3,3,0,0,,3,3,3,3 -4,4,1,1,,4,4,4,4 +1,1,1,1,,1,1,1,1 +2,2,2,2,,2,2,2,2 +3,3,3,3,,3,3,3,3 +4,4,0,0,,4,4,4,4 5,5,1,1,,5,5,5,5 -6,6,1,1,,6,6,6,6 -7,7,1,1,,7,7,7,7 -8,8,2,2,,8,8,8,8 -9,9,2,2,,9,9,9,9 +6,6,2,2,,6,6,6,6 +7,7,3,3,,7,7,7,7 +8,8,0,0,,8,8,8,8 +9,9,1,1,,9,9,9,9 10,10,2,2,,10,10,10,10 -11,11,2,2,,11,11,11,11 -12,12,3,3,,12,12,12,12 -13,13,3,3,,13,13,13,13 -14,14,3,3,,14,14,14,14 +11,11,3,3,,11,11,11,11 +12,12,0,0,,12,12,12,12 +13,13,1,1,,13,13,13,13 +14,14,2,2,,14,14,14,14 15,15,3,3,,15,15,15,15 diff --git a/tests/expected/lscpu/lscpu-x86_64-ibme326m b/tests/expected/lscpu/lscpu-x86_64-ibme326m index a373aacc..ccc64a07 100644 --- a/tests/expected/lscpu/lscpu-x86_64-ibme326m +++ b/tests/expected/lscpu/lscpu-x86_64-ibme326m @@ -12,6 +12,7 @@ CPU MHz: 1995.058 L1d cache: 1024K L1i cache: 1024K L2 cache: 1024K +NUMA node0 CPU(s): 0,1 # 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-x86_64-necem14 b/tests/expected/lscpu/lscpu-x86_64-necem14 index 0cde9c31..c823f7e7 100644 --- a/tests/expected/lscpu/lscpu-x86_64-necem14 +++ b/tests/expected/lscpu/lscpu-x86_64-necem14 @@ -11,6 +11,7 @@ Stepping: 3 CPU MHz: 3790.599 L1d cache: 16K L2 cache: 2048K +NUMA node0 CPU(s): 0,1 # The following is the parsable format, which can be fed to other # programs. Each different item in every column has an unique ID -- 2.39.5