tests/linux: add /proc/hwloc-nofile-info with Architecture field to some tarballs...

diff --git a/tests/linux/16ia64-8n2s.output b/tests/linux/16ia64-8n2s.output
index f4348827f4b6e84483f08ac777836e45310a7a95..af431ae091fc80a15b51b00aa8a19340c64c8009 100644 (file)
--- a/tests/linux/16ia64-8n2s.output
+++ b/tests/linux/16ia64-8n2s.output
@@ -1,14 +1,14 @@
-Machine (P#0 total=48346688KB Backend=Linux)
+Machine (P#0 total=48346688KB Backend=Linux Architecture=ia64)
   Group0 L#0 (total=24182720KB)
     NUMANode L#0 (P#0 local=6045632KB total=6045632KB)
-      Socket L#0 (P#0 CPUModel="Madison up to 9M cache")
+      Socket L#0 (P#0 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#0 (size=9216KB linesize=128 ways=18)
           L2Cache L#0 (size=256KB linesize=128 ways=8)
             L1dCache L#0 (size=16KB linesize=64 ways=4)
               L1iCache L#0 (size=16KB linesize=64 ways=4)
                 Core L#0 (P#0)
                   PU L#0 (P#0)
-      Socket L#1 (P#0 CPUModel="Madison up to 9M cache")
+      Socket L#1 (P#0 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#1 (size=9216KB linesize=128 ways=18)
           L2Cache L#1 (size=256KB linesize=128 ways=8)
             L1dCache L#1 (size=16KB linesize=64 ways=4)
@@ -16,14 +16,14 @@ Machine (P#0 total=48346688KB Backend=Linux)
                 Core L#1 (P#0)
                   PU L#1 (P#1)
     NUMANode L#1 (P#1 local=6045696KB total=6045696KB)
-      Socket L#2 (P#512 CPUModel="Madison up to 9M cache")
+      Socket L#2 (P#512 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#2 (size=9216KB linesize=128 ways=18)
           L2Cache L#2 (size=256KB linesize=128 ways=8)
             L1dCache L#2 (size=16KB linesize=64 ways=4)
               L1iCache L#2 (size=16KB linesize=64 ways=4)
                 Core L#2 (P#0)
                   PU L#2 (P#2)
-      Socket L#3 (P#512 CPUModel="Madison up to 9M cache")
+      Socket L#3 (P#512 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#3 (size=9216KB linesize=128 ways=18)
           L2Cache L#3 (size=256KB linesize=128 ways=8)
             L1dCache L#3 (size=16KB linesize=64 ways=4)
@@ -31,14 +31,14 @@ Machine (P#0 total=48346688KB Backend=Linux)
                 Core L#3 (P#0)
                   PU L#3 (P#3)
     NUMANode L#2 (P#2 local=6045696KB total=6045696KB)
-      Socket L#4 (P#1024 CPUModel="Madison up to 9M cache")
+      Socket L#4 (P#1024 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#4 (size=9216KB linesize=128 ways=18)
           L2Cache L#4 (size=256KB linesize=128 ways=8)
             L1dCache L#4 (size=16KB linesize=64 ways=4)
               L1iCache L#4 (size=16KB linesize=64 ways=4)
                 Core L#4 (P#0)
                   PU L#4 (P#4)
-      Socket L#5 (P#1024 CPUModel="Madison up to 9M cache")
+      Socket L#5 (P#1024 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#5 (size=9216KB linesize=128 ways=18)
           L2Cache L#5 (size=256KB linesize=128 ways=8)
             L1dCache L#5 (size=16KB linesize=64 ways=4)
@@ -46,14 +46,14 @@ Machine (P#0 total=48346688KB Backend=Linux)
                 Core L#5 (P#0)
                   PU L#5 (P#5)
     NUMANode L#3 (P#3 local=6045696KB total=6045696KB)
-      Socket L#6 (P#1536 CPUModel="Madison up to 9M cache")
+      Socket L#6 (P#1536 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#6 (size=9216KB linesize=128 ways=18)
           L2Cache L#6 (size=256KB linesize=128 ways=8)
             L1dCache L#6 (size=16KB linesize=64 ways=4)
               L1iCache L#6 (size=16KB linesize=64 ways=4)
                 Core L#6 (P#0)
                   PU L#6 (P#6)
-      Socket L#7 (P#1536 CPUModel="Madison up to 9M cache")
+      Socket L#7 (P#1536 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#7 (size=9216KB linesize=128 ways=18)
           L2Cache L#7 (size=256KB linesize=128 ways=8)
             L1dCache L#7 (size=16KB linesize=64 ways=4)
@@ -62,14 +62,14 @@ Machine (P#0 total=48346688KB Backend=Linux)
                   PU L#7 (P#7)
   Group0 L#1 (total=24163968KB)
     NUMANode L#4 (P#4 local=6045696KB total=6045696KB)
-      Socket L#8 (P#2048 CPUModel="Madison up to 9M cache")
+      Socket L#8 (P#2048 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#8 (size=9216KB linesize=128 ways=18)
           L2Cache L#8 (size=256KB linesize=128 ways=8)
             L1dCache L#8 (size=16KB linesize=64 ways=4)
               L1iCache L#8 (size=16KB linesize=64 ways=4)
                 Core L#8 (P#0)
                   PU L#8 (P#8)
-      Socket L#9 (P#2048 CPUModel="Madison up to 9M cache")
+      Socket L#9 (P#2048 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#9 (size=9216KB linesize=128 ways=18)
           L2Cache L#9 (size=256KB linesize=128 ways=8)
             L1dCache L#9 (size=16KB linesize=64 ways=4)
@@ -77,14 +77,14 @@ Machine (P#0 total=48346688KB Backend=Linux)
                 Core L#9 (P#0)
                   PU L#9 (P#9)
     NUMANode L#5 (P#5 local=6045632KB total=6045632KB)
-      Socket L#10 (P#2560 CPUModel="Madison up to 9M cache")
+      Socket L#10 (P#2560 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#10 (size=9216KB linesize=128 ways=18)
           L2Cache L#10 (size=256KB linesize=128 ways=8)
             L1dCache L#10 (size=16KB linesize=64 ways=4)
               L1iCache L#10 (size=16KB linesize=64 ways=4)
                 Core L#10 (P#0)
                   PU L#10 (P#10)
-      Socket L#11 (P#2560 CPUModel="Madison up to 9M cache")
+      Socket L#11 (P#2560 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#11 (size=9216KB linesize=128 ways=18)
           L2Cache L#11 (size=256KB linesize=128 ways=8)
             L1dCache L#11 (size=16KB linesize=64 ways=4)
@@ -92,14 +92,14 @@ Machine (P#0 total=48346688KB Backend=Linux)
                 Core L#11 (P#0)
                   PU L#11 (P#11)
     NUMANode L#6 (P#6 local=6045696KB total=6045696KB)
-      Socket L#12 (P#3072 CPUModel="Madison up to 9M cache")
+      Socket L#12 (P#3072 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#12 (size=9216KB linesize=128 ways=18)
           L2Cache L#12 (size=256KB linesize=128 ways=8)
             L1dCache L#12 (size=16KB linesize=64 ways=4)
               L1iCache L#12 (size=16KB linesize=64 ways=4)
                 Core L#12 (P#0)
                   PU L#12 (P#12)
-      Socket L#13 (P#3072 CPUModel="Madison up to 9M cache")
+      Socket L#13 (P#3072 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#13 (size=9216KB linesize=128 ways=18)
           L2Cache L#13 (size=256KB linesize=128 ways=8)
             L1dCache L#13 (size=16KB linesize=64 ways=4)
@@ -107,14 +107,14 @@ Machine (P#0 total=48346688KB Backend=Linux)
                 Core L#13 (P#0)
                   PU L#13 (P#13)
     NUMANode L#7 (P#7 local=6026944KB total=6026944KB)
-      Socket L#14 (P#3584 CPUModel="Madison up to 9M cache")
+      Socket L#14 (P#3584 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#14 (size=9216KB linesize=128 ways=18)
           L2Cache L#14 (size=256KB linesize=128 ways=8)
             L1dCache L#14 (size=16KB linesize=64 ways=4)
               L1iCache L#14 (size=16KB linesize=64 ways=4)
                 Core L#14 (P#0)
                   PU L#14 (P#14)
-      Socket L#15 (P#3584 CPUModel="Madison up to 9M cache")
+      Socket L#15 (P#3584 CPUVendor=GenuineIntel CPUModel="Madison up to 9M cache" CPUModelNumber=2 CPUFamilyNumber=31)
         L3Cache L#15 (size=9216KB linesize=128 ways=18)
           L2Cache L#15 (size=256KB linesize=128 ways=8)
             L1dCache L#15 (size=16KB linesize=64 ways=4)

diff --git a/tests/linux/16ia64-8n2s.tar.bz2 b/tests/linux/16ia64-8n2s.tar.bz2
index fa21b824903c8a5ad7b18710fe5986356c0e68ff..49382a6004e39e5fe30898c22033365ced38cc56 100644 (file)
Binary files a/tests/linux/16ia64-8n2s.tar.bz2 and b/tests/linux/16ia64-8n2s.tar.bz2 differ

diff --git a/tests/linux/8em64t-4c2t.output b/tests/linux/8em64t-4c2t.output
index 7abf2213fd22d00ac798ae32c0149f6115611b02..d8460b4d2e095095f881410b1965b5d0358e5745 100644 (file)
--- a/tests/linux/8em64t-4c2t.output
+++ b/tests/linux/8em64t-4c2t.output
@@ -1,5 +1,5 @@
-Machine (P#0 local=1016272KB total=1016272KB Backend=Linux)
-  Socket L#0 (P#1 CPUModel="Genuine Intel(R) CPU           @ 0000 @ 2.93GHz")
+Machine (P#0 local=1016272KB total=1016272KB Backend=Linux Architecture=x86_64)
+  Socket L#0 (P#1 CPUVendor=GenuineIntel CPUModel="Genuine Intel(R) CPU           @ 0000 @ 2.93GHz" CPUModelNumber=26 CPUFamilyNumber=6)
     L3Cache L#0 (size=8192KB linesize=64 ways=16)
       L2Cache L#0 (size=256KB linesize=64 ways=8)
         L1dCache L#0 (size=32KB linesize=64 ways=8)

diff --git a/tests/linux/8em64t-4c2t.tar.bz2 b/tests/linux/8em64t-4c2t.tar.bz2
index 47a7b6fe58cef545ac48121405c241bd50a3499b..419f024f28672066f55e82d931d472013f42eb2c 100644 (file)
Binary files a/tests/linux/8em64t-4c2t.tar.bz2 and b/tests/linux/8em64t-4c2t.tar.bz2 differ