Skip to content

Commit af69b78

Browse files
bgoglinbgoglin
committed
tests/linux: add a variant of the KNL/hybrid case where we really want mscache as mscache
Signed-off-by: Brice Goglin <[email protected]>
1 parent 567ab68 commit af69b78

File tree

4 files changed

+155
-0
lines changed

4 files changed

+155
-0
lines changed

‎tests/hwloc/linux/64intel64-fakeKNL-SNC4-hybrid-msc.env

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
HWLOC_KNL_MSCACHE_L3=0
2+
export HWLOC_KNL_MSCACHE_L3

‎tests/hwloc/linux/64intel64-fakeKNL-SNC4-hybrid-msc.output

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
Machine (P#0 total=12582912KB ClusterMode=SNC4 MemoryMode=Hybrid50 Backend=Linux OSName=Linux OSRelease=3.10.0-327.el7.x86_64 OSVersion="#1 SMP Thu Oct 29 17:29:29 EDT 2015" HostName=localhost.localdomain Architecture=x86_64)
2+
Package L#0 (P#0 total=12582912KB CPUVendor=GenuineIntel CPUFamilyNumber=6 CPUModelNumber=87 CPUModel=06/57 CPUStepping=0)
3+
Group0(Cluster) L#0 (total=3145728KB)
4+
MemCache L#0 (total=1048576KB size=2097152KB linesize=64 ways=1 Inclusive=1)
5+
NUMANode L#0 (P#0 local=1048576KB total=1048576KB)
6+
NUMANode(MCDRAM) L#1 (P#7 local=2097152KB total=2097152KB)
7+
L2Cache L#0 (size=4096KB linesize=64)
8+
L1dCache L#0 (size=32KB linesize=64)
9+
L1iCache L#0 (size=32KB linesize=64)
10+
Core L#0 (P#0)
11+
PU L#0 (P#0)
12+
PU L#1 (P#16)
13+
PU L#2 (P#32)
14+
PU L#3 (P#48)
15+
L1dCache L#1 (size=32KB linesize=64)
16+
L1iCache L#1 (size=32KB linesize=64)
17+
Core L#1 (P#1)
18+
PU L#4 (P#1)
19+
PU L#5 (P#17)
20+
PU L#6 (P#33)
21+
PU L#7 (P#49)
22+
L2Cache L#1 (size=4096KB linesize=64)
23+
L1dCache L#2 (size=32KB linesize=64)
24+
L1iCache L#2 (size=32KB linesize=64)
25+
Core L#2 (P#2)
26+
PU L#8 (P#2)
27+
PU L#9 (P#18)
28+
PU L#10 (P#34)
29+
PU L#11 (P#50)
30+
L1dCache L#3 (size=32KB linesize=64)
31+
L1iCache L#3 (size=32KB linesize=64)
32+
Core L#3 (P#3)
33+
PU L#12 (P#3)
34+
PU L#13 (P#19)
35+
PU L#14 (P#35)
36+
PU L#15 (P#51)
37+
Group0(Cluster) L#1 (total=3145728KB)
38+
MemCache L#1 (total=1048576KB size=2097152KB linesize=64 ways=1 Inclusive=1)
39+
NUMANode L#2 (P#1 local=1048576KB total=1048576KB)
40+
NUMANode(MCDRAM) L#3 (P#4 local=2097152KB total=2097152KB)
41+
L2Cache L#2 (size=4096KB linesize=64)
42+
L1dCache L#4 (size=32KB linesize=64)
43+
L1iCache L#4 (size=32KB linesize=64)
44+
Core L#4 (P#4)
45+
PU L#16 (P#4)
46+
PU L#17 (P#20)
47+
PU L#18 (P#36)
48+
PU L#19 (P#52)
49+
L1dCache L#5 (size=32KB linesize=64)
50+
L1iCache L#5 (size=32KB linesize=64)
51+
Core L#5 (P#5)
52+
PU L#20 (P#5)
53+
PU L#21 (P#21)
54+
PU L#22 (P#37)
55+
PU L#23 (P#53)
56+
L2Cache L#3 (size=4096KB linesize=64)
57+
L1dCache L#6 (size=32KB linesize=64)
58+
L1iCache L#6 (size=32KB linesize=64)
59+
Core L#6 (P#6)
60+
PU L#24 (P#6)
61+
PU L#25 (P#22)
62+
PU L#26 (P#38)
63+
PU L#27 (P#54)
64+
L1dCache L#7 (size=32KB linesize=64)
65+
L1iCache L#7 (size=32KB linesize=64)
66+
Core L#7 (P#7)
67+
PU L#28 (P#7)
68+
PU L#29 (P#23)
69+
PU L#30 (P#39)
70+
PU L#31 (P#55)
71+
Group0(Cluster) L#2 (total=3145728KB)
72+
MemCache L#2 (total=1048576KB size=2097152KB linesize=64 ways=1 Inclusive=1)
73+
NUMANode L#4 (P#2 local=1048576KB total=1048576KB)
74+
NUMANode(MCDRAM) L#5 (P#5 local=2097152KB total=2097152KB)
75+
L2Cache L#4 (size=4096KB linesize=64)
76+
L1dCache L#8 (size=32KB linesize=64)
77+
L1iCache L#8 (size=32KB linesize=64)
78+
Core L#8 (P#8)
79+
PU L#32 (P#8)
80+
PU L#33 (P#24)
81+
PU L#34 (P#40)
82+
PU L#35 (P#56)
83+
L1dCache L#9 (size=32KB linesize=64)
84+
L1iCache L#9 (size=32KB linesize=64)
85+
Core L#9 (P#9)
86+
PU L#36 (P#9)
87+
PU L#37 (P#25)
88+
PU L#38 (P#41)
89+
PU L#39 (P#57)
90+
L2Cache L#5 (size=4096KB linesize=64)
91+
L1dCache L#10 (size=32KB linesize=64)
92+
L1iCache L#10 (size=32KB linesize=64)
93+
Core L#10 (P#10)
94+
PU L#40 (P#10)
95+
PU L#41 (P#26)
96+
PU L#42 (P#42)
97+
PU L#43 (P#58)
98+
L1dCache L#11 (size=32KB linesize=64)
99+
L1iCache L#11 (size=32KB linesize=64)
100+
Core L#11 (P#11)
101+
PU L#44 (P#11)
102+
PU L#45 (P#27)
103+
PU L#46 (P#43)
104+
PU L#47 (P#59)
105+
Group0(Cluster) L#3 (total=3145728KB)
106+
MemCache L#3 (total=1048576KB size=2097152KB linesize=64 ways=1 Inclusive=1)
107+
NUMANode L#6 (P#3 local=1048576KB total=1048576KB)
108+
NUMANode(MCDRAM) L#7 (P#6 local=2097152KB total=2097152KB)
109+
L2Cache L#6 (size=4096KB linesize=64)
110+
L1dCache L#12 (size=32KB linesize=64)
111+
L1iCache L#12 (size=32KB linesize=64)
112+
Core L#12 (P#12)
113+
PU L#48 (P#12)
114+
PU L#49 (P#28)
115+
PU L#50 (P#44)
116+
PU L#51 (P#60)
117+
L1dCache L#13 (size=32KB linesize=64)
118+
L1iCache L#13 (size=32KB linesize=64)
119+
Core L#13 (P#13)
120+
PU L#52 (P#13)
121+
PU L#53 (P#29)
122+
PU L#54 (P#45)
123+
PU L#55 (P#61)
124+
L2Cache L#7 (size=4096KB linesize=64)
125+
L1dCache L#14 (size=32KB linesize=64)
126+
L1iCache L#14 (size=32KB linesize=64)
127+
Core L#14 (P#14)
128+
PU L#56 (P#14)
129+
PU L#57 (P#30)
130+
PU L#58 (P#46)
131+
PU L#59 (P#62)
132+
L1dCache L#15 (size=32KB linesize=64)
133+
L1iCache L#15 (size=32KB linesize=64)
134+
Core L#15 (P#15)
135+
PU L#60 (P#15)
136+
PU L#61 (P#31)
137+
PU L#62 (P#47)
138+
PU L#63 (P#63)
139+
depth 0: 1 Machine (type #0)
140+
depth 1: 1 Package (type #1)
141+
depth 2: 4 Group0 (type #12)
142+
depth 3: 8 L2Cache (type #5)
143+
depth 4: 16 L1dCache (type #4)
144+
depth 5: 16 L1iCache (type #9)
145+
depth 6: 16 Core (type #2)
146+
depth 7: 64 PU (type #3)
147+
Special depth -3: 8 NUMANode (type #13)
148+
Special depth -8: 4 MemCache (type #18)
149+
Topology not from this system

‎tests/hwloc/linux/64intel64-fakeKNL-SNC4-hybrid-msc.source

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
64intel64-fakeKNL-SNC4-hybrid.tar.bz2

‎tests/hwloc/linux/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ sysfs_outputs = \
5252
64fake-4n2s2ca2c2t.output \
5353
64intel64-fakeKNL-A2A-cache.output \
5454
64intel64-fakeKNL-SNC4-hybrid.output \
55+
64intel64-fakeKNL-SNC4-hybrid-msc.output \
5556
96em64t-4n4d3ca2co.output \
5657
128ia64-17n4s2c.output \
5758
256ia64-64n2s2c.output \
@@ -111,6 +112,7 @@ sysfs_tarballs = \
111112
64fake-4n2s2ca2c2t.tar.bz2 \
112113
64intel64-fakeKNL-A2A-cache.tar.bz2 \
113114
64intel64-fakeKNL-SNC4-hybrid.tar.bz2 \
115+
64intel64-fakeKNL-SNC4-hybrid-msc.source \
114116
96em64t-4n4d3ca2co.tar.bz2 \
115117
128ia64-17n4s2c.tar.bz2 \
116118
256ia64-64n2s2c.tar.bz2 \
@@ -152,6 +154,7 @@ sysfs_envs = \
152154
256ppc-8n8s4t-nocache.env \
153155
40intel64-2g2n4c+pci.env \
154156
40intel64-4n10c+pci-conflicts.env \
157+
64intel64-fakeKNL-SNC4-hybrid-msc.env \
155158
nvidiagpunumanodes.kept.env \
156159
fakeheteronuma.env
157160

0 commit comments

Comments
 (0)