Skip to content

Commit b8148e7

Browse files
zulinx86zulinx86
committed
feat: CPU template mapping Sapphire Rapids to EC2 T2
Adds a CPU template mapping Intel Sapphire Rapids to EC2 T2 instance type. We need a different CPU template for older kernels (prior to v5.17), because KVM does not support Intel AMX. Signed-off-by: Takahiro Itazuri <[email protected]>
1 parent b0c191e commit b8148e7

10 files changed

+2482
-3
lines changed

‎.buildkite/pipeline_cpu_template.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class BkStep(str, Enum):
3030
"c5n.metal",
3131
"m5n.metal",
3232
"m6i.metal",
33+
"m7i.metal-24xl",
34+
"m7i.metal-48xl",
3335
"m6a.metal",
3436
"m7a.metal-48xl",
3537
],
@@ -69,6 +71,8 @@ class BkStep(str, Enum):
6971
"c5n.metal",
7072
"m5n.metal",
7173
"m6i.metal",
74+
"m7i.metal-24xl",
75+
"m7i.metal-48xl",
7276
"m6a.metal",
7377
],
7478
},

‎tests/data/custom_cpu_templates/SPR_TO_T2_5.10.json

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{
2+
"cpuid_modifiers": [
3+
{
4+
"leaf": "0x1",
5+
"subleaf": "0x0",
6+
"flags": 0,
7+
"modifiers": [
8+
{
9+
"register": "eax",
10+
"bitmap": "0bxxxx000000000011xx00011011110010"
11+
},
12+
{
13+
"register": "ecx",
14+
"bitmap": "0bxxxxxxxxxxxxx0xx00xx00x0000000xx"
15+
},
16+
{
17+
"register": "edx",
18+
"bitmap": "0b000x0xxxx00xx0xxxxx1xxxx1xxxxxxx"
19+
}
20+
]
21+
},
22+
{
23+
"leaf": "0x7",
24+
"subleaf": "0x0",
25+
"flags": 1,
26+
"modifiers": [
27+
{
28+
"register": "ebx",
29+
"bitmap": "0b00000000000x000000x00x1xxxx0x0xx"
30+
},
31+
{
32+
"register": "ecx",
33+
"bitmap": "0bx0x00x00x0xxxxx0x0x00000x0x0000x"
34+
},
35+
{
36+
"register": "edx",
37+
"bitmap": "0bxxxxxx0000xxxxx0x0xxxxx0xxx000xx"
38+
}
39+
]
40+
},
41+
{
42+
"leaf": "0x7",
43+
"subleaf": "0x1",
44+
"flags": 1,
45+
"modifiers": [
46+
{
47+
"register": "eax",
48+
"bitmap": "0bxxxxxxxxxxxxxxxxxxxxxxxxxx00xxxx"
49+
}
50+
]
51+
},
52+
{
53+
"leaf": "0xd",
54+
"subleaf": "0x0",
55+
"flags": 1,
56+
"modifiers": [
57+
{
58+
"register": "eax",
59+
"bitmap": "0bxxxxxxxxxxxxx00xxxxxxx0x00000xxx"
60+
}
61+
]
62+
},
63+
{
64+
"leaf": "0xd",
65+
"subleaf": "0x1",
66+
"flags": 1,
67+
"modifiers": [
68+
{
69+
"register": "eax",
70+
"bitmap": "0bxxxxxxxxxxxxxxxxxxxxxxxxxxx0000x"
71+
}
72+
]
73+
},
74+
{
75+
"leaf": "0x80000001",
76+
"subleaf": "0x0",
77+
"flags": 0,
78+
"modifiers": [
79+
{
80+
"register": "ecx",
81+
"bitmap": "0bxx0xxxxxxxxxxxxxxxxxxxx0xxxxxxxx"
82+
},
83+
{
84+
"register": "edx",
85+
"bitmap": "0bxxxxx0xxxxxxxxxxxxxxxxxxxxxxxxxx"
86+
}
87+
]
88+
},
89+
{
90+
"leaf": "0x80000008",
91+
"subleaf": "0x0",
92+
"flags": 0,
93+
"modifiers": [
94+
{
95+
"register": "ebx",
96+
"bitmap": "0bxxxxxxxxxxxxxxxxxxxxxx0xxxxxxxxx"
97+
}
98+
]
99+
}
100+
],
101+
"msr_modifiers": []
102+
}

‎tests/data/custom_cpu_templates/SPR_TO_T2_6.1.json

Lines changed: 217 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,217 @@
1+
{
2+
"cpuid_modifiers": [
3+
{
4+
"leaf": "0x1",
5+
"subleaf": "0x0",
6+
"flags": 0,
7+
"modifiers": [
8+
{
9+
"register": "eax",
10+
"bitmap": "0bxxxx000000000011xx00011011110010"
11+
},
12+
{
13+
"register": "ecx",
14+
"bitmap": "0bxxxxxxxxxxxxx0xx00xx00x0000000xx"
15+
},
16+
{
17+
"register": "edx",
18+
"bitmap": "0b000x0xxxx00xx0xxxxx1xxxx1xxxxxxx"
19+
}
20+
]
21+
},
22+
{
23+
"leaf": "0x7",
24+
"subleaf": "0x0",
25+
"flags": 1,
26+
"modifiers": [
27+
{
28+
"register": "ebx",
29+
"bitmap": "0b00000000000x000000x00x1xxxx0x0xx"
30+
},
31+
{
32+
"register": "ecx",
33+
"bitmap": "0bx0x00x00x0xxxxx0x0x00000x0x0000x"
34+
},
35+
{
36+
"register": "edx",
37+
"bitmap": "0bxxxxxx0000xxxxx0x0xxxxx0xxx000xx"
38+
}
39+
]
40+
},
41+
{
42+
"leaf": "0x7",
43+
"subleaf": "0x1",
44+
"flags": 1,
45+
"modifiers": [
46+
{
47+
"register": "eax",
48+
"bitmap": "0bxxxxxxxxxxxxxxxxxxxxxxxxxx00xxxx"
49+
}
50+
]
51+
},
52+
{
53+
"leaf": "0xd",
54+
"subleaf": "0x0",
55+
"flags": 1,
56+
"modifiers": [
57+
{
58+
"register": "eax",
59+
"bitmap": "0bxxxxxxxxxxxxx00xxxxxxx0x00000xxx"
60+
}
61+
]
62+
},
63+
{
64+
"leaf": "0xd",
65+
"subleaf": "0x1",
66+
"flags": 1,
67+
"modifiers": [
68+
{
69+
"register": "eax",
70+
"bitmap": "0bxxxxxxxxxxxxxxxxxxxxxxxxxxx0000x"
71+
}
72+
]
73+
},
74+
{
75+
"leaf": "0xd",
76+
"subleaf": "0x11",
77+
"flags": 1,
78+
"modifiers": [
79+
{
80+
"register": "eax",
81+
"bitmap": "0b00000000000000000000000000000000"
82+
},
83+
{
84+
"register": "ebx",
85+
"bitmap": "0b00000000000000000000000000000000"
86+
},
87+
{
88+
"register": "ecx",
89+
"bitmap": "0b00000000000000000000000000000000"
90+
},
91+
{
92+
"register": "edx",
93+
"bitmap": "0b00000000000000000000000000000000"
94+
}
95+
]
96+
},
97+
{
98+
"leaf": "0xd",
99+
"subleaf": "0x12",
100+
"flags": 1,
101+
"modifiers": [
102+
{
103+
"register": "eax",
104+
"bitmap": "0b00000000000000000000000000000000"
105+
},
106+
{
107+
"register": "ebx",
108+
"bitmap": "0b00000000000000000000000000000000"
109+
},
110+
{
111+
"register": "ecx",
112+
"bitmap": "0b00000000000000000000000000000000"
113+
},
114+
{
115+
"register": "edx",
116+
"bitmap": "0b00000000000000000000000000000000"
117+
}
118+
]
119+
},
120+
{
121+
"leaf": "0x1d",
122+
"subleaf": "0x0",
123+
"flags": 1,
124+
"modifiers": [
125+
{
126+
"register": "eax",
127+
"bitmap": "0b00000000000000000000000000000000"
128+
},
129+
{
130+
"register": "ebx",
131+
"bitmap": "0b00000000000000000000000000000000"
132+
},
133+
{
134+
"register": "ecx",
135+
"bitmap": "0b00000000000000000000000000000000"
136+
},
137+
{
138+
"register": "edx",
139+
"bitmap": "0b00000000000000000000000000000000"
140+
}
141+
]
142+
},
143+
{
144+
"leaf": "0x1d",
145+
"subleaf": "0x1",
146+
"flags": 1,
147+
"modifiers": [
148+
{
149+
"register": "eax",
150+
"bitmap": "0b00000000000000000000000000000000"
151+
},
152+
{
153+
"register": "ebx",
154+
"bitmap": "0b00000000000000000000000000000000"
155+
},
156+
{
157+
"register": "ecx",
158+
"bitmap": "0b00000000000000000000000000000000"
159+
},
160+
{
161+
"register": "edx",
162+
"bitmap": "0b00000000000000000000000000000000"
163+
}
164+
]
165+
},
166+
{
167+
"leaf": "0x1e",
168+
"subleaf": "0x0",
169+
"flags": 0,
170+
"modifiers": [
171+
{
172+
"register": "eax",
173+
"bitmap": "0b00000000000000000000000000000000"
174+
},
175+
{
176+
"register": "ebx",
177+
"bitmap": "0b00000000000000000000000000000000"
178+
},
179+
{
180+
"register": "ecx",
181+
"bitmap": "0b00000000000000000000000000000000"
182+
},
183+
{
184+
"register": "edx",
185+
"bitmap": "0b00000000000000000000000000000000"
186+
}
187+
]
188+
},
189+
{
190+
"leaf": "0x80000001",
191+
"subleaf": "0x0",
192+
"flags": 0,
193+
"modifiers": [
194+
{
195+
"register": "ecx",
196+
"bitmap": "0bxx0xxxxxxxxxxxxxxxxxxxx0xxxxxxxx"
197+
},
198+
{
199+
"register": "edx",
200+
"bitmap": "0bxxxxx0xxxxxxxxxxxxxxxxxxxxxxxxxx"
201+
}
202+
]
203+
},
204+
{
205+
"leaf": "0x80000008",
206+
"subleaf": "0x0",
207+
"flags": 0,
208+
"modifiers": [
209+
{
210+
"register": "ebx",
211+
"bitmap": "0bxxxxxxxxxxxxxxxxxxxxxx0xxxxxxxxx"
212+
}
213+
]
214+
}
215+
],
216+
"msr_modifiers": []
217+
}

0 commit comments

Comments
 (0)