Skip to content

Commit 7e5fd20

Browse files
PaulYuuuPaulYuuu
authored
Merge pull request #4213 from nanliu-r/remove_unsupported_cpu_models_for_rhel10
2 parents bae03fa + cc8c4ad commit 7e5fd20

File tree

2 files changed

+42
-29
lines changed

2 files changed

+42
-29
lines changed

‎qemu/tests/cfg/x86_cpu_flags.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
- others:
111111
variants:
112112
- test_default_model:
113-
no RHEL.9
113+
only RHEL.7, RHEL.8, Win10, Win2016, Win2019
114114
auto_cpu_model = no
115115
# will use the default variable 'default_cpu_model' in avocado-vt
116116
flags = ""

‎qemu/tests/cfg/x86_cpu_model.cfg

Lines changed: 41 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,61 +27,61 @@
2727
model_pattern = "AMD EPYC-Genoa Processor%s"
2828
cpu_model_flags += ",svm=on"
2929
# support CPU model since RHEL.9.3
30-
RHEL.6, RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
30+
RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
3131
flags = ""
3232
- EPYC-Genoa-v1:
3333
only HostCpuVendor.amd
3434
flags = "la57 vnmi avx512f avx512dq avx512ifma avx512cd avx512bw avx512vl avx512vbmi avx512_vbmi2 gfni avx512_vnni avx512_bitalg avx512_vpopcntdq avx512_bf16"
3535
model_pattern = "AMD EPYC-Genoa Processor%s"
3636
cpu_model_flags += ",svm=on"
3737
# support CPU model since RHEL.9.3
38-
RHEL.6, RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
38+
RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
3939
flags = ""
4040
- EPYC-Milan:
4141
only HostCpuVendor.amd
4242
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip xsaves pcid ibrs ssbd erms fsrm invpcid pku"
4343
model_pattern = "AMD EPYC-Milan Processor%s"
4444
# support 'pcid' since RHEL.8.3
45-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
45+
RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
4646
flags = ""
4747
- EPYC-Milan-v1:
4848
only HostCpuVendor.amd
4949
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip xsaves pcid ibrs ssbd erms fsrm invpcid pku"
5050
model_pattern = "AMD EPYC-Milan Processor%s"
5151
# support 'pcid' since RHEL.8.3
52-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
52+
RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
5353
flags = ""
5454
- EPYC-Milan-v2:
5555
only HostCpuVendor.amd
5656
required_qemu = [8.0.0,)
5757
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip xsaves pcid ibrs ssbd erms fsrm invpcid pku"
5858
model_pattern = "AMD EPYC-Milan-v2 Processor%s"
5959
# support 'pcid' since RHEL.8.3
60-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
60+
RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
6161
flags = ""
6262
- EPYC-Rome:
6363
only HostCpuVendor.amd
6464
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip"
6565
RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
6666
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip xsaves"
6767
model_pattern = "AMD EPYC-Rome Processor%s"
68-
RHEL.6, RHEL.7:
68+
RHEL.7:
6969
flags = ""
7070
- EPYC-Rome-v1:
7171
only HostCpuVendor.amd
7272
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip"
7373
RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
7474
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip xsaves"
7575
model_pattern = "AMD EPYC-Rome Processor%s"
76-
RHEL.6, RHEL.7:
76+
RHEL.7:
7777
flags = ""
7878
- EPYC-Rome-v2:
7979
only HostCpuVendor.amd
8080
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip"
8181
RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
8282
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip xsaves"
8383
model_pattern = "AMD EPYC-Rome Processor%s"
84-
RHEL.6, RHEL.7:
84+
RHEL.7:
8585
flags = ""
8686
- EPYC-Rome-v3:
8787
only HostCpuVendor.amd
@@ -90,14 +90,14 @@
9090
RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
9191
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip xsaves"
9292
model_pattern = "AMD EPYC-Rome-v3 Processor%s"
93-
RHEL.6, RHEL.7:
93+
RHEL.7:
9494
flags = ""
9595
- EPYC-Rome-v4:
9696
only HostCpuVendor.amd
9797
required_qemu = [8.0.0,)
9898
flags = "movbe rdrand rdtscp fxsr_opt cr8_legacy osvw fsgsbase bmi1 avx2 smep bmi2 rdseed adx smap clflushopt sha_ni xsaveopt xsavec xgetbv1 arat f16c xsaveerptr clzero rdpid perfctr_core ibpb wbnoinvd stibp clwb umip"
9999
model_pattern = "AMD EPYC-Rome-v4 Processor%s"
100-
RHEL.6, RHEL.7:
100+
RHEL.7:
101101
flags = ""
102102
- EPYC:
103103
only HostCpuVendor.amd
@@ -124,15 +124,17 @@
124124
model_pattern = "AMD EPYC-v4 Processor%s"
125125
- Opteron_G5:
126126
only HostCpuVendor.amd
127+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
127128
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de f16c avx xsave aes popcnt sse4_2 sse4_1 cx16 fma ssse3 pclmulqdq lm pdpe1gb nx syscall tbm fma4 xop 3dnowprefetch misalignsse sse4a abm lahf_lm fpu"
128129
model_pattern = "AMD Opteron 63xx class CPU%s"
129130
- Opteron_G4:
130131
only HostCpuVendor.amd
132+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
131133
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de avx xsave aes popcnt sse4_2 sse4_1 cx16 ssse3 pclmulqdq lm pdpe1gb nx syscall fma4 xop 3dnowprefetch misalignsse sse4a abm lahf_lm fpu"
132134
model_pattern = "AMD Opteron 62xx class CPU%s"
133135
- Opteron_G3:
134136
only HostCpuVendor.amd
135-
no RHEL.9
137+
only RHEL.7, RHEL.8, Win10, Win11, Win2016, Win2019
136138
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de popcnt cx16 lm nx syscall misalignsse sse4a abm lahf_lm fpu"
137139
model_pattern = "AMD Opteron 23xx \(Gen 3 Class Opteron%s\)"
138140
- SapphireRapids:
@@ -152,42 +154,47 @@
152154
model_pattern = "Intel Xeon Processor \(SapphireRapids\)"
153155
- Snowridge:
154156
only HostCpuVendor.intel
157+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
155158
flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
156159
model_pattern = "Intel Atom Processor \(SnowRidge%s\)"
157160
# support 'movdiri' since RHEL.8.2
158-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
161+
RHEL.7, RHEL.8.0, RHEL.8.1:
159162
flags = ""
160163
- Snowridge-v1:
161164
only HostCpuVendor.intel
165+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
162166
flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
163167
model_pattern = "Intel Atom Processor \(SnowRidge%s\)"
164168
# support 'movdiri' since RHEL.8.2
165-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
169+
RHEL.7, RHEL.8.0, RHEL.8.1:
166170
flags = ""
167171
- Snowridge-v2:
168172
only HostCpuVendor.intel
173+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
169174
flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
170175
model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
171176
no_flags = "mpx"
172177
# support 'movdiri' since RHEL.8.2
173-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
178+
RHEL.7, RHEL.8.0, RHEL.8.1:
174179
flags = ""
175180
- Snowridge-v3:
176181
only HostCpuVendor.intel
182+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
177183
flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
178184
model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
179185
no_flags = "mpx"
180186
# support 'movdiri' since RHEL.8.2
181-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
187+
RHEL.7, RHEL.8.0, RHEL.8.1:
182188
flags = ""
183189
- Snowridge-v4:
184190
only HostCpuVendor.intel
191+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
185192
required_qemu = [6.2.0,)
186193
# no split lock detect, no core-capability
187194
flags = "gfni movdiri movdir64b cldemote umip"
188195
model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
189196
no_flags = "mpx"
190-
RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
197+
RHEL.7, RHEL.8.0, RHEL.8.1:
191198
flags = ""
192199
- Cooperlake:
193200
only HostCpuVendor.intel
@@ -216,28 +223,28 @@
216223
only HostCpuVendor.intel
217224
flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
218225
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
219-
RHEL.6, RHEL.7:
226+
RHEL.7:
220227
flags = ""
221228
- Icelake-Server-noTSX:
222229
# alias of Icelake-Server-v2
223230
only HostCpuVendor.intel
224231
flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
225232
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
226233
no_flags = "hle rtm"
227-
RHEL.6, RHEL.7:
234+
RHEL.7:
228235
flags = ""
229236
- Icelake-Server-v1:
230237
only HostCpuVendor.intel
231238
flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
232239
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
233-
RHEL.6, RHEL.7:
240+
RHEL.7:
234241
flags = ""
235242
- Icelake-Server-v2:
236243
only HostCpuVendor.intel
237244
flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
238245
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
239246
no_flags = "hle rtm"
240-
RHEL.6, RHEL.7:
247+
RHEL.7:
241248
flags = ""
242249
- Icelake-Server-v3:
243250
only HostCpuVendor.intel
@@ -246,7 +253,7 @@
246253
cpu_model_flags += ",-taa-no"
247254
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
248255
no_flags = "hle rtm"
249-
RHEL.6, RHEL.7:
256+
RHEL.7:
250257
flags = ""
251258
- Icelake-Server-v4:
252259
only HostCpuVendor.intel
@@ -255,7 +262,7 @@
255262
cpu_model_flags += ",-taa-no"
256263
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
257264
no_flags = "hle rtm"
258-
RHEL.6, RHEL.7:
265+
RHEL.7:
259266
flags = ""
260267
- Icelake-Server-v5:
261268
only HostCpuVendor.intel
@@ -264,7 +271,7 @@
264271
cpu_model_flags += ",-taa-no"
265272
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
266273
no_flags = "hle rtm"
267-
RHEL.6, RHEL.7:
274+
RHEL.7:
268275
flags = ""
269276
- Icelake-Server-v6:
270277
only HostCpuVendor.intel
@@ -274,24 +281,24 @@
274281
cpu_model_flags += ",-taa-no"
275282
model_pattern = "Intel Xeon Processor \(Icelake%s\)"
276283
no_flags = "hle rtm"
277-
RHEL.6, RHEL.7:
284+
RHEL.7:
278285
flags = ""
279286
- Icelake-Client:
280287
only HostCpuVendor.intel
281-
no RHEL.9
288+
only RHEL.7, RHEL.8, Win10, Win11, Win2016, Win2019
282289
required_qemu = (, 5.2.0)
283290
flags = "wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq"
284291
model_pattern = "Intel Core Processor \(Icelake%s\)"
285-
RHEL.6, RHEL.7:
292+
RHEL.7:
286293
flags = ""
287294
- Icelake-Client-noTSX:
288295
only HostCpuVendor.intel
289-
no RHEL.9
296+
only RHEL.7, RHEL.8, Win10, Win11, Win2016, Win2019
290297
required_qemu = (, 5.2.0)
291298
flags = "wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq"
292299
model_pattern = "Intel Core Processor \(Icelake%s\)"
293300
no_flags = "hle rtm"
294-
RHEL.6, RHEL.7:
301+
RHEL.7:
295302
flags = ""
296303
- Cascadelake-Server:
297304
only HostCpuVendor.intel
@@ -469,26 +476,32 @@
469476
no_flags = "hle rtm"
470477
- IvyBridge:
471478
only HostCpuVendor.intel
479+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
472480
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni rdrand fsgsbase smep erms lm rdtscp nx syscall lahf_lm xsaveopt arat f16c"
473481
model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge%s\)"
474482
- IvyBridge-v1:
475483
only HostCpuVendor.intel
484+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
476485
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni rdrand fsgsbase smep erms lm rdtscp nx syscall lahf_lm xsaveopt arat f16c"
477486
model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge%s\)"
478487
- IvyBridge-v2:
479488
only HostCpuVendor.intel
489+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
480490
# support "spec-ctrl"
481491
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni rdrand fsgsbase smep erms lm rdtscp nx syscall lahf_lm xsaveopt arat f16c"
482492
model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge, IBRS%s\)"
483493
- SandyBridge:
484494
only HostCpuVendor.intel
495+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
485496
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni lm rdtscp nx syscall lahf_lm xsaveopt arat"
486497
model_pattern = "Intel Xeon E312xx \(Sandy Bridge%s\)"
487498
- SandyBridge-v1:
488499
only HostCpuVendor.intel
500+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
489501
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni lm rdtscp nx syscall lahf_lm xsaveopt arat"
490502
model_pattern = "Intel Xeon E312xx \(Sandy Bridge%s\)"
491503
- SandyBridge-v2:
492504
only HostCpuVendor.intel
505+
only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
493506
flags = "vme sse2 sse fxsr mmx clflush pse36 pat cmov mca pge mtrr sep apic cx8 mce pae msr tsc pse de fpu avx xsave aes tsc_deadline_timer popcnt x2apic sse4_2 sse4_1 cx16 ssse3 pclmulqdq pni lm rdtscp nx syscall lahf_lm xsaveopt arat"
494507
model_pattern = "Intel Xeon E312xx \(Sandy Bridge, IBRS update%s\)"

0 commit comments

Comments
 (0)