Merge pull request #4213 from nanliu-r/remove_unsupported_cpu_models_…

…for_rhel10
autotest · Dec 10, 2024 · 7e5fd20 · 7e5fd20
2 parents bae03fa + cc8c4ad
commit 7e5fd20
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 29 deletions.
diff --git a/qemu/tests/cfg/x86_cpu_flags.cfg b/qemu/tests/cfg/x86_cpu_flags.cfg
@@ -110,7 +110,7 @@
         - others:
             variants:
                 - test_default_model:
-                    no RHEL.9
+                    only RHEL.7, RHEL.8, Win10, Win2016, Win2019
                     auto_cpu_model = no
                     # will use the default variable 'default_cpu_model' in avocado-vt
                     flags = ""

diff --git a/qemu/tests/cfg/x86_cpu_model.cfg b/qemu/tests/cfg/x86_cpu_model.cfg
@@ -27,61 +27,61 @@
             model_pattern = "AMD EPYC-Genoa Processor%s"
             cpu_model_flags += ",svm=on"
             # support CPU model since RHEL.9.3
-            RHEL.6, RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
+            RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
                 flags = ""
         - EPYC-Genoa-v1:
             only HostCpuVendor.amd
             flags = "la57 vnmi avx512f avx512dq avx512ifma avx512cd avx512bw avx512vl avx512vbmi avx512_vbmi2 gfni avx512_vnni avx512_bitalg avx512_vpopcntdq avx512_bf16"
             model_pattern = "AMD EPYC-Genoa Processor%s"
             cpu_model_flags += ",svm=on"
             # support CPU model since RHEL.9.3
-            RHEL.6, RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
+            RHEL.7, RHEL.8, RHEL.9.1, RHEL.9.2:
                 flags = ""
         - EPYC-Milan:
             only HostCpuVendor.amd
             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"
             model_pattern = "AMD EPYC-Milan Processor%s"
             # support 'pcid' since RHEL.8.3
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
+            RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
                 flags = ""
         - EPYC-Milan-v1:
             only HostCpuVendor.amd
             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"
             model_pattern = "AMD EPYC-Milan Processor%s"
             # support 'pcid' since RHEL.8.3
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
+            RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
                 flags = ""
         - EPYC-Milan-v2:
             only HostCpuVendor.amd
             required_qemu = [8.0.0,)
             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"
             model_pattern = "AMD EPYC-Milan-v2 Processor%s"
             # support 'pcid' since RHEL.8.3
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
+            RHEL.7, RHEL.8.0, RHEL.8.1, RHEL.8.2:
                 flags = ""
         - EPYC-Rome:
             only HostCpuVendor.amd
             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"
             RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
                 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"
             model_pattern = "AMD EPYC-Rome Processor%s"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - EPYC-Rome-v1:
             only HostCpuVendor.amd
             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"
             RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
                 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"
             model_pattern = "AMD EPYC-Rome Processor%s"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - EPYC-Rome-v2:
             only HostCpuVendor.amd
             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"
             RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
                 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"
             model_pattern = "AMD EPYC-Rome Processor%s"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - EPYC-Rome-v3:
             only HostCpuVendor.amd
@@ -90,14 +90,14 @@
             RHEL.8, RHEL.9.0, RHEL.9.1, RHEL.9.2, RHEL.9.3, RHEL.9.4:
                 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"
             model_pattern = "AMD EPYC-Rome-v3 Processor%s"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - EPYC-Rome-v4:
             only HostCpuVendor.amd
             required_qemu = [8.0.0,)
             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"
             model_pattern = "AMD EPYC-Rome-v4 Processor%s"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - EPYC:
             only HostCpuVendor.amd
@@ -124,15 +124,17 @@
             model_pattern = "AMD EPYC-v4 Processor%s"
         - Opteron_G5:
             only HostCpuVendor.amd
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             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"
             model_pattern = "AMD Opteron 63xx class CPU%s"
         - Opteron_G4:
             only HostCpuVendor.amd
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             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"
             model_pattern = "AMD Opteron 62xx class CPU%s"
         - Opteron_G3:
             only HostCpuVendor.amd
-            no RHEL.9
+            only RHEL.7, RHEL.8, Win10, Win11, Win2016, Win2019
             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"
             model_pattern = "AMD Opteron 23xx \(Gen 3 Class Opteron%s\)"
         - SapphireRapids:
@@ -152,42 +154,47 @@
             model_pattern = "Intel Xeon Processor \(SapphireRapids\)"
         - Snowridge:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(SnowRidge%s\)"
             # support 'movdiri' since RHEL.8.2
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
+            RHEL.7, RHEL.8.0, RHEL.8.1:
                 flags = ""
         - Snowridge-v1:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(SnowRidge%s\)"
             # support 'movdiri' since RHEL.8.2
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
+            RHEL.7, RHEL.8.0, RHEL.8.1:
                 flags = ""
         - Snowridge-v2:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
             no_flags = "mpx"
             # support 'movdiri' since RHEL.8.2
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
+            RHEL.7, RHEL.8.0, RHEL.8.1:
                 flags = ""
         - Snowridge-v3:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             flags = "split_lock_detect gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
             no_flags = "mpx"
             # support 'movdiri' since RHEL.8.2
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
+            RHEL.7, RHEL.8.0, RHEL.8.1:
                 flags = ""
         - Snowridge-v4:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             required_qemu = [6.2.0,)
             # no split lock detect, no core-capability
             flags = "gfni movdiri movdir64b cldemote umip"
             model_pattern = "Intel Atom Processor \(Snowridge, no MPX%s\)"
             no_flags = "mpx"
-            RHEL.6, RHEL.7, RHEL.8.0, RHEL.8.1:
+            RHEL.7, RHEL.8.0, RHEL.8.1:
                 flags = ""
         - Cooperlake:
             only HostCpuVendor.intel
@@ -216,28 +223,28 @@
             only HostCpuVendor.intel
             flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Server-noTSX:
             # alias of Icelake-Server-v2
             only HostCpuVendor.intel
             flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
             no_flags = "hle rtm"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Server-v1:
             only HostCpuVendor.intel
             flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Server-v2:
             only HostCpuVendor.intel
             flags = "la57 wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq clflushopt pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
             no_flags = "hle rtm"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Server-v3:
             only HostCpuVendor.intel
@@ -246,7 +253,7 @@
             cpu_model_flags += ",-taa-no"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
             no_flags = "hle rtm"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Server-v4:
             only HostCpuVendor.intel
@@ -255,7 +262,7 @@
             cpu_model_flags += ",-taa-no"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
             no_flags = "hle rtm"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Server-v5:
             only HostCpuVendor.intel
@@ -264,7 +271,7 @@
             cpu_model_flags += ",-taa-no"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
             no_flags = "hle rtm"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Server-v6:
             only HostCpuVendor.intel
@@ -274,24 +281,24 @@
             cpu_model_flags += ",-taa-no"
             model_pattern = "Intel Xeon Processor \(Icelake%s\)"
             no_flags = "hle rtm"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Client:
             only HostCpuVendor.intel
-            no RHEL.9
+            only RHEL.7, RHEL.8, Win10, Win11, Win2016, Win2019
             required_qemu = (, 5.2.0)
             flags = "wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq"
             model_pattern = "Intel Core Processor \(Icelake%s\)"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Icelake-Client-noTSX:
             only HostCpuVendor.intel
-            no RHEL.9
+            only RHEL.7, RHEL.8, Win10, Win11, Win2016, Win2019
             required_qemu = (, 5.2.0)
             flags = "wbnoinvd avx512vbmi umip avx512_vbmi2 gfni vaes vpclmulqdq avx512_bitalg avx512_vpopcntdq"
             model_pattern = "Intel Core Processor \(Icelake%s\)"
             no_flags = "hle rtm"
-            RHEL.6, RHEL.7:
+            RHEL.7:
                 flags = ""
         - Cascadelake-Server:
             only HostCpuVendor.intel
@@ -469,26 +476,32 @@
             no_flags = "hle rtm"
         - IvyBridge:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             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"
             model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge%s\)"
         - IvyBridge-v1:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             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"
             model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge%s\)"
         - IvyBridge-v2:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             # support "spec-ctrl"
             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"
             model_pattern = "Intel Xeon E3-12xx v2 \(Ivy Bridge, IBRS%s\)"
         - SandyBridge:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             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"
             model_pattern = "Intel Xeon E312xx \(Sandy Bridge%s\)"
         - SandyBridge-v1:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             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"
             model_pattern = "Intel Xeon E312xx \(Sandy Bridge%s\)"
         - SandyBridge-v2:
             only HostCpuVendor.intel
+            only RHEL.7, RHEL.8, RHEL.9, Win10, Win11, Win2016, Win2019, Win2022, Win2025
             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"
             model_pattern = "Intel Xeon E312xx \(Sandy Bridge, IBRS update%s\)"