Merge pull request #2288 from huangyum/tsx

x86_cpu_model: Update model_pattern for some cpu models

Merge pull request #2288 from huangyum/tsx
x86_cpu_model: Update model_pattern for some cpu models
3ea62e58 · Yanan Fu · GitHub · 853892ad · 31030e6b · 3ea62e58
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

qemu/tests/cfg/x86_cpu_model.cfg qemu/tests/cfg/x86_cpu_model.cfg +2 -2

未找到文件。
--- a/qemu/tests/cfg/x86_cpu_model.cfg
+++ b/qemu/tests/cfg/x86_cpu_model.cfg
@@ -58,14 +58,14 @@
            model_pattern = "Intel Xeon Processor \(Skylake%s\)"
        - Skylake-Server-noTSX:
            flags = "pdpe1gb clwb avx512f avx512dq avx512bw avx512cd avx512vl"
-            model_pattern = "Intel Xeon Processor \(Skylake%s\)"
+            model_pattern = "Intel Xeon Processor \(Skylake%s(, no TSX)?\)"
            no_flags = "hle rtm"
        - Skylake-Client:
            flags = "xsavec xgetbv1"
            model_pattern = "Intel Core Processor \(Skylake%s\)"
        - Skylake-Client-noTSX:
            flags = "xsavec xgetbv1"
-            model_pattern = "Intel Core Processor \(Skylake%s\)"
+            model_pattern = "Intel Core Processor \(Skylake%s(, no TSX)?\)"
            no_flags = "hle rtm"
        - Broadwell:
            flags = "adx rdseed 3dnowprefetch smap hle rtm"