Skip to content

Commit f0dc8fa

Browse files
bgoglinbgoglin
committed
tests/x86: add a RaptorLake hybrid test
6 big HT cores, with private L2. 8 small non-HT cores, with L2 shared by 4. Signed-off-by: Brice Goglin <[email protected]>
1 parent 2ab91ca commit f0dc8fa

File tree

4 files changed

+185
-0
lines changed

4 files changed

+185
-0
lines changed

‎tests/hwloc/x86/Intel-RaptorLake-Corei7-1370P.tar.bz2

2.05 KB
Binary file not shown.

‎tests/hwloc/x86/Intel-RaptorLake-Corei7-1370P.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source: Intel-RaptorLake-Corei7-1370P.tar.bz2
2+
target: Intel-RaptorLake-Corei7-1370P.xml

‎tests/hwloc/x86/Intel-RaptorLake-Corei7-1370P.xml

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE topology SYSTEM "hwloc2.dtd">
3+
<topology version="3.0">
4+
<object type="Machine" os_index="0" cpuset="0x000fffff" complete_cpuset="0x000fffff" allowed_cpuset="0x000fffff" nodeset="0x00000001" complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
5+
<object type="Package" os_index="0" cpuset="0x000fffff" complete_cpuset="0x000fffff" nodeset="0x00000001" complete_nodeset="0x00000001">
6+
<info name="CPUVendor" value="GenuineIntel"/>
7+
<info name="CPUFamilyNumber" value="6"/>
8+
<info name="CPUModelNumber" value="186"/>
9+
<info name="CPUModel" value="13th Gen Intel(R) Core(TM) i7-1370P"/>
10+
<info name="CPUStepping" value="2"/>
11+
<object type="NUMANode" os_index="0" cpuset="0x000fffff" complete_cpuset="0x000fffff" nodeset="0x00000001" complete_nodeset="0x00000001"/>
12+
<object type="L3Cache" cpuset="0x000fffff" complete_cpuset="0x000fffff" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="25165824" depth="3" cache_linesize="64" cache_associativity="12" cache_type="0">
13+
<info name="Inclusive" value="0"/>
14+
<object type="L2Cache" cpuset="0x00000003" complete_cpuset="0x00000003" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="1310720" depth="2" cache_linesize="64" cache_associativity="10" cache_type="0">
15+
<info name="Inclusive" value="0"/>
16+
<object type="L1Cache" cpuset="0x00000003" complete_cpuset="0x00000003" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="49152" depth="1" cache_linesize="64" cache_associativity="12" cache_type="1">
17+
<info name="Inclusive" value="0"/>
18+
<object type="L1iCache" cpuset="0x00000003" complete_cpuset="0x00000003" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
19+
<info name="Inclusive" value="0"/>
20+
<object type="Core" os_index="0" cpuset="0x00000003" complete_cpuset="0x00000003" nodeset="0x00000001" complete_nodeset="0x00000001">
21+
<object type="PU" os_index="0" cpuset="0x00000001" complete_cpuset="0x00000001" nodeset="0x00000001" complete_nodeset="0x00000001"/>
22+
<object type="PU" os_index="1" cpuset="0x00000002" complete_cpuset="0x00000002" nodeset="0x00000001" complete_nodeset="0x00000001"/>
23+
</object>
24+
</object>
25+
</object>
26+
</object>
27+
<object type="L2Cache" cpuset="0x0000000c" complete_cpuset="0x0000000c" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="1310720" depth="2" cache_linesize="64" cache_associativity="10" cache_type="0">
28+
<info name="Inclusive" value="0"/>
29+
<object type="L1Cache" cpuset="0x0000000c" complete_cpuset="0x0000000c" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="49152" depth="1" cache_linesize="64" cache_associativity="12" cache_type="1">
30+
<info name="Inclusive" value="0"/>
31+
<object type="L1iCache" cpuset="0x0000000c" complete_cpuset="0x0000000c" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
32+
<info name="Inclusive" value="0"/>
33+
<object type="Core" os_index="4" cpuset="0x0000000c" complete_cpuset="0x0000000c" nodeset="0x00000001" complete_nodeset="0x00000001">
34+
<object type="PU" os_index="2" cpuset="0x00000004" complete_cpuset="0x00000004" nodeset="0x00000001" complete_nodeset="0x00000001"/>
35+
<object type="PU" os_index="3" cpuset="0x00000008" complete_cpuset="0x00000008" nodeset="0x00000001" complete_nodeset="0x00000001"/>
36+
</object>
37+
</object>
38+
</object>
39+
</object>
40+
<object type="L2Cache" cpuset="0x00000030" complete_cpuset="0x00000030" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="1310720" depth="2" cache_linesize="64" cache_associativity="10" cache_type="0">
41+
<info name="Inclusive" value="0"/>
42+
<object type="L1Cache" cpuset="0x00000030" complete_cpuset="0x00000030" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="49152" depth="1" cache_linesize="64" cache_associativity="12" cache_type="1">
43+
<info name="Inclusive" value="0"/>
44+
<object type="L1iCache" cpuset="0x00000030" complete_cpuset="0x00000030" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
45+
<info name="Inclusive" value="0"/>
46+
<object type="Core" os_index="8" cpuset="0x00000030" complete_cpuset="0x00000030" nodeset="0x00000001" complete_nodeset="0x00000001">
47+
<object type="PU" os_index="4" cpuset="0x00000010" complete_cpuset="0x00000010" nodeset="0x00000001" complete_nodeset="0x00000001"/>
48+
<object type="PU" os_index="5" cpuset="0x00000020" complete_cpuset="0x00000020" nodeset="0x00000001" complete_nodeset="0x00000001"/>
49+
</object>
50+
</object>
51+
</object>
52+
</object>
53+
<object type="L2Cache" cpuset="0x000000c0" complete_cpuset="0x000000c0" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="1310720" depth="2" cache_linesize="64" cache_associativity="10" cache_type="0">
54+
<info name="Inclusive" value="0"/>
55+
<object type="L1Cache" cpuset="0x000000c0" complete_cpuset="0x000000c0" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="49152" depth="1" cache_linesize="64" cache_associativity="12" cache_type="1">
56+
<info name="Inclusive" value="0"/>
57+
<object type="L1iCache" cpuset="0x000000c0" complete_cpuset="0x000000c0" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
58+
<info name="Inclusive" value="0"/>
59+
<object type="Core" os_index="12" cpuset="0x000000c0" complete_cpuset="0x000000c0" nodeset="0x00000001" complete_nodeset="0x00000001">
60+
<object type="PU" os_index="6" cpuset="0x00000040" complete_cpuset="0x00000040" nodeset="0x00000001" complete_nodeset="0x00000001"/>
61+
<object type="PU" os_index="7" cpuset="0x00000080" complete_cpuset="0x00000080" nodeset="0x00000001" complete_nodeset="0x00000001"/>
62+
</object>
63+
</object>
64+
</object>
65+
</object>
66+
<object type="L2Cache" cpuset="0x00000300" complete_cpuset="0x00000300" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="1310720" depth="2" cache_linesize="64" cache_associativity="10" cache_type="0">
67+
<info name="Inclusive" value="0"/>
68+
<object type="L1Cache" cpuset="0x00000300" complete_cpuset="0x00000300" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="49152" depth="1" cache_linesize="64" cache_associativity="12" cache_type="1">
69+
<info name="Inclusive" value="0"/>
70+
<object type="L1iCache" cpuset="0x00000300" complete_cpuset="0x00000300" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
71+
<info name="Inclusive" value="0"/>
72+
<object type="Core" os_index="16" cpuset="0x00000300" complete_cpuset="0x00000300" nodeset="0x00000001" complete_nodeset="0x00000001">
73+
<object type="PU" os_index="8" cpuset="0x00000100" complete_cpuset="0x00000100" nodeset="0x00000001" complete_nodeset="0x00000001"/>
74+
<object type="PU" os_index="9" cpuset="0x00000200" complete_cpuset="0x00000200" nodeset="0x00000001" complete_nodeset="0x00000001"/>
75+
</object>
76+
</object>
77+
</object>
78+
</object>
79+
<object type="L2Cache" cpuset="0x00000c00" complete_cpuset="0x00000c00" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="1310720" depth="2" cache_linesize="64" cache_associativity="10" cache_type="0">
80+
<info name="Inclusive" value="0"/>
81+
<object type="L1Cache" cpuset="0x00000c00" complete_cpuset="0x00000c00" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="49152" depth="1" cache_linesize="64" cache_associativity="12" cache_type="1">
82+
<info name="Inclusive" value="0"/>
83+
<object type="L1iCache" cpuset="0x00000c00" complete_cpuset="0x00000c00" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
84+
<info name="Inclusive" value="0"/>
85+
<object type="Core" os_index="20" cpuset="0x00000c00" complete_cpuset="0x00000c00" nodeset="0x00000001" complete_nodeset="0x00000001">
86+
<object type="PU" os_index="10" cpuset="0x00000400" complete_cpuset="0x00000400" nodeset="0x00000001" complete_nodeset="0x00000001"/>
87+
<object type="PU" os_index="11" cpuset="0x00000800" complete_cpuset="0x00000800" nodeset="0x00000001" complete_nodeset="0x00000001"/>
88+
</object>
89+
</object>
90+
</object>
91+
</object>
92+
<object type="L2Cache" cpuset="0x0000f000" complete_cpuset="0x0000f000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="2097152" depth="2" cache_linesize="64" cache_associativity="16" cache_type="0">
93+
<info name="Inclusive" value="0"/>
94+
<object type="L1Cache" cpuset="0x00001000" complete_cpuset="0x00001000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
95+
<info name="Inclusive" value="0"/>
96+
<object type="L1iCache" cpuset="0x00001000" complete_cpuset="0x00001000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
97+
<info name="Inclusive" value="0"/>
98+
<object type="Core" os_index="24" cpuset="0x00001000" complete_cpuset="0x00001000" nodeset="0x00000001" complete_nodeset="0x00000001">
99+
<object type="PU" os_index="12" cpuset="0x00001000" complete_cpuset="0x00001000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
100+
</object>
101+
</object>
102+
</object>
103+
<object type="L1Cache" cpuset="0x00002000" complete_cpuset="0x00002000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
104+
<info name="Inclusive" value="0"/>
105+
<object type="L1iCache" cpuset="0x00002000" complete_cpuset="0x00002000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
106+
<info name="Inclusive" value="0"/>
107+
<object type="Core" os_index="25" cpuset="0x00002000" complete_cpuset="0x00002000" nodeset="0x00000001" complete_nodeset="0x00000001">
108+
<object type="PU" os_index="13" cpuset="0x00002000" complete_cpuset="0x00002000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
109+
</object>
110+
</object>
111+
</object>
112+
<object type="L1Cache" cpuset="0x00004000" complete_cpuset="0x00004000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
113+
<info name="Inclusive" value="0"/>
114+
<object type="L1iCache" cpuset="0x00004000" complete_cpuset="0x00004000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
115+
<info name="Inclusive" value="0"/>
116+
<object type="Core" os_index="26" cpuset="0x00004000" complete_cpuset="0x00004000" nodeset="0x00000001" complete_nodeset="0x00000001">
117+
<object type="PU" os_index="14" cpuset="0x00004000" complete_cpuset="0x00004000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
118+
</object>
119+
</object>
120+
</object>
121+
<object type="L1Cache" cpuset="0x00008000" complete_cpuset="0x00008000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
122+
<info name="Inclusive" value="0"/>
123+
<object type="L1iCache" cpuset="0x00008000" complete_cpuset="0x00008000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
124+
<info name="Inclusive" value="0"/>
125+
<object type="Core" os_index="27" cpuset="0x00008000" complete_cpuset="0x00008000" nodeset="0x00000001" complete_nodeset="0x00000001">
126+
<object type="PU" os_index="15" cpuset="0x00008000" complete_cpuset="0x00008000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
127+
</object>
128+
</object>
129+
</object>
130+
</object>
131+
<object type="L2Cache" cpuset="0x000f0000" complete_cpuset="0x000f0000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="2097152" depth="2" cache_linesize="64" cache_associativity="16" cache_type="0">
132+
<info name="Inclusive" value="0"/>
133+
<object type="L1Cache" cpuset="0x00010000" complete_cpuset="0x00010000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
134+
<info name="Inclusive" value="0"/>
135+
<object type="L1iCache" cpuset="0x00010000" complete_cpuset="0x00010000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
136+
<info name="Inclusive" value="0"/>
137+
<object type="Core" os_index="28" cpuset="0x00010000" complete_cpuset="0x00010000" nodeset="0x00000001" complete_nodeset="0x00000001">
138+
<object type="PU" os_index="16" cpuset="0x00010000" complete_cpuset="0x00010000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
139+
</object>
140+
</object>
141+
</object>
142+
<object type="L1Cache" cpuset="0x00020000" complete_cpuset="0x00020000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
143+
<info name="Inclusive" value="0"/>
144+
<object type="L1iCache" cpuset="0x00020000" complete_cpuset="0x00020000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
145+
<info name="Inclusive" value="0"/>
146+
<object type="Core" os_index="29" cpuset="0x00020000" complete_cpuset="0x00020000" nodeset="0x00000001" complete_nodeset="0x00000001">
147+
<object type="PU" os_index="17" cpuset="0x00020000" complete_cpuset="0x00020000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
148+
</object>
149+
</object>
150+
</object>
151+
<object type="L1Cache" cpuset="0x00040000" complete_cpuset="0x00040000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
152+
<info name="Inclusive" value="0"/>
153+
<object type="L1iCache" cpuset="0x00040000" complete_cpuset="0x00040000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
154+
<info name="Inclusive" value="0"/>
155+
<object type="Core" os_index="30" cpuset="0x00040000" complete_cpuset="0x00040000" nodeset="0x00000001" complete_nodeset="0x00000001">
156+
<object type="PU" os_index="18" cpuset="0x00040000" complete_cpuset="0x00040000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
157+
</object>
158+
</object>
159+
</object>
160+
<object type="L1Cache" cpuset="0x00080000" complete_cpuset="0x00080000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="32768" depth="1" cache_linesize="64" cache_associativity="8" cache_type="1">
161+
<info name="Inclusive" value="0"/>
162+
<object type="L1iCache" cpuset="0x00080000" complete_cpuset="0x00080000" nodeset="0x00000001" complete_nodeset="0x00000001" cache_size="65536" depth="1" cache_linesize="64" cache_associativity="8" cache_type="2">
163+
<info name="Inclusive" value="0"/>
164+
<object type="Core" os_index="31" cpuset="0x00080000" complete_cpuset="0x00080000" nodeset="0x00000001" complete_nodeset="0x00000001">
165+
<object type="PU" os_index="19" cpuset="0x00080000" complete_cpuset="0x00080000" nodeset="0x00000001" complete_nodeset="0x00000001"/>
166+
</object>
167+
</object>
168+
</object>
169+
</object>
170+
</object>
171+
</object>
172+
</object>
173+
<cpukind cpuset="0x000ff000">
174+
<info name="CoreType" value="IntelAtom"/>
175+
</cpukind>
176+
<cpukind cpuset="0x00000fff">
177+
<info name="CoreType" value="IntelCore"/>
178+
</cpukind>
179+
<info name="Backend" value="x86"/>
180+
</topology>

‎tests/hwloc/x86/Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ AM_LDFLAGS = $(HWLOC_LDFLAGS)
77

88
# Add your tests files here.
99
cpuid_tests = \
10+
Intel-RaptorLake-Corei7-1370P.test \
1011
Intel-SapphireRapids-2xXeonMax9460.test \
1112
Intel-CPUID.1A-1p2co2t.test \
1213
Intel-CPUID.1F-Qemu-2p3d3c2t.test \
@@ -41,6 +42,7 @@ cpuid_tests = \
4142
# XML outputs shouldn't have gp_index attributes to avoid spurious errors.
4243
# Remove them with: sed -r -e 's/ gp_index=\"[0-9]+\"//' -i foo.outpu
4344
cpuid_xml_outputs = \
45+
Intel-RaptorLake-Corei7-1370P.xml \
4446
Intel-SapphireRapids-2xXeonMax9460.xml \
4547
Intel-CPUID.1A-1p2co2t.xml \
4648
Intel-CPUID.1F-Qemu-2p3d3c2t.xml \
@@ -74,6 +76,7 @@ cpuid_xml_outputs = \
7476
# Each output `xyz.output' must have a corresponding tarball `xyz.tar.bz2'
7577
# specifying which tarball to use
7678
cpuid_tarballs = \
79+
Intel-RaptorLake-Corei7-1370P.tar.bz2 \
7780
Intel-SapphireRapids-2xXeonMax9460.tar.bz2 \
7881
Intel-CPUID.1A-1p2co2t.tar.bz2 \
7982
Intel-CPUID.1F-Qemu-2p3d3c2t.tar.bz2 \

0 commit comments

Comments
 (0)