tests: refactor test_cpu_features_x86_64.py

Make the common feature flags to get some clarity on what are the
differences between the CPUs.

Signed-off-by: Pablo Barbáchano <[email protected]>

Author: pb8o

tests/integration_tests/functional/test_cpu_features_x86_64.py

@@ -203,6 +203,57 @@ def test_brand_string(uvm_plain_any):
         assert False
 
 
+INTEL_HOST_ONLY_FEATS = {
+    "acpi",
+    "aperfmperf",
+    "arch_perfmon",
+    "art",
+    "bts",
+    "cat_l3",
+    "cdp_l3",
+    "cqm",
+    "cqm_llc",
+    "cqm_mbm_local",
+    "cqm_mbm_total",
+    "cqm_occup_llc",
+    "dca",
+    "ds_cpl",
+    "dtes64",
+    "dtherm",
+    "dts",
+    "epb",
+    "ept",
+    "ept_ad",
+    "est",
+    "flexpriority",
+    "flush_l1d",
+    "hwp",
+    "hwp_act_window",
+    "hwp_epp",
+    "hwp_pkg_req",
+    "ida",
+    "intel_ppin",
+    "intel_pt",
+    "mba",
+    "monitor",
+    "pbe",
+    "pdcm",
+    "pebs",
+    "pln",
+    "pts",
+    "rdt_a",
+    "sdbg",
+    "smx",
+    "tm",
+    "tm2",
+    "tpr_shadow",
+    "vmx",
+    "vnmi",
+    "vpid",
+    "xtpr",
+}
+
+
 def test_host_vs_guest_cpu_features_x86_64(uvm_nano):
     """Check CPU features host vs guest"""
 
@@ -283,110 +334,14 @@ def test_host_vs_guest_cpu_features_x86_64(uvm_nano):
                 "tsc_known_freq",
             }
         case CpuModel.INTEL_SKYLAKE:
-            assert host_feats - guest_feats == {
-                "acpi",
-                "aperfmperf",
-                "arch_perfmon",
-                "art",
-                "bts",
-                "cat_l3",
-                "cdp_l3",
-                "cqm",
-                "cqm_llc",
-                "cqm_mbm_local",
-                "cqm_mbm_total",
-                "cqm_occup_llc",
-                "dca",
-                "ds_cpl",
-                "dtes64",
-                "dtherm",
-                "dts",
-                "epb",
-                "ept",
-                "ept_ad",
-                "est",
-                "flexpriority",
-                "flush_l1d",
-                "hwp",
-                "hwp_act_window",
-                "hwp_epp",
-                "hwp_pkg_req",
-                "ida",
-                "intel_ppin",
-                "intel_pt",
-                "mba",
-                "monitor",
-                "pbe",
-                "pdcm",
-                "pebs",
-                "pln",
-                "pts",
-                "rdt_a",
-                "sdbg",
-                "smx",
-                "tm",
-                "tm2",
-                "tpr_shadow",
-                "vmx",
-                "vnmi",
-                "vpid",
-                "xtpr",
-            }
+            assert host_feats - guest_feats == INTEL_HOST_ONLY_FEATS
             assert guest_feats - host_feats == {
                 "hypervisor",
                 "tsc_known_freq",
                 "umip",
             }
         case CpuModel.INTEL_CASCADELAKE:
-            expected_host_minus_guest = {
-                "acpi",
-                "aperfmperf",
-                "arch_perfmon",
-                "art",
-                "bts",
-                "cat_l3",
-                "cdp_l3",
-                "cqm",
-                "cqm_llc",
-                "cqm_mbm_local",
-                "cqm_mbm_total",
-                "cqm_occup_llc",
-                "dca",
-                "ds_cpl",
-                "dtes64",
-                "dtherm",
-                "dts",
-                "epb",
-                "ept",
-                "ept_ad",
-                "est",
-                "flexpriority",
-                "flush_l1d",
-                "hwp",
-                "hwp_act_window",
-                "hwp_epp",
-                "hwp_pkg_req",
-                "ida",
-                "intel_ppin",
-                "intel_pt",
-                "mba",
-                "monitor",
-                "pbe",
-                "pdcm",
-                "pebs",
-                "pln",
-                "pts",
-                "rdt_a",
-                "sdbg",
-                "smx",
-                "tm",
-                "tm2",
-                "tpr_shadow",
-                "vmx",
-                "vnmi",
-                "vpid",
-                "xtpr",
-            }
+            expected_host_minus_guest = INTEL_HOST_ONLY_FEATS
             expected_guest_minus_host = {
                 "hypervisor",
                 "tsc_known_freq",
@@ -414,56 +369,10 @@ def test_host_vs_guest_cpu_features_x86_64(uvm_nano):
             assert host_feats - guest_feats == expected_host_minus_guest
             assert guest_feats - host_feats == expected_guest_minus_host
         case CpuModel.INTEL_ICELAKE:
-            host_guest_diff_5_10 = {
-                "dtes64",
-                "hwp_act_window",
-                "pdcm",
-                "acpi",
-                "aperfmperf",
-                "arch_perfmon",
-                "art",
-                "bts",
-                "cat_l3",
-                "cqm",
-                "cqm_llc",
-                "cqm_mbm_local",
-                "cqm_mbm_total",
-                "cqm_occup_llc",
-                "dca",
-                "ds_cpl",
-                "dtherm",
-                "dts",
-                "epb",
-                "ept",
-                "ept_ad",
-                "est",
-                "flexpriority",
-                "flush_l1d",
-                "hwp",
-                "hwp_epp",
-                "hwp_pkg_req",
-                "ida",
-                "intel_ppin",
-                "intel_pt",
-                "mba",
-                "monitor",
-                "pbe",
+            host_guest_diff_5_10 = INTEL_HOST_ONLY_FEATS - {"cdp_l3"} | {
                 "pconfig",
-                "pebs",
-                "pln",
-                "pts",
-                "rdt_a",
-                "sdbg",
-                "smx",
-                "split_lock_detect",
-                "tm",
-                "tm2",
                 "tme",
-                "tpr_shadow",
-                "vmx",
-                "vnmi",
-                "vpid",
-                "xtpr",
+                "split_lock_detect",
             }
             host_guest_diff_6_1 = host_guest_diff_5_10 - {
                 "bts",
@@ -1261,7 +1170,7 @@ def test_c3_on_skylake_show_warning(uvm_plain, cpu_template):
         "does not apply the mitigation against MMIO stale data "
         "vulnerability."
     )
-    if cpu_template == "C3" and global_props.cpu_codename == "INTEL_SKYLAKE":
+    if uvm.cpu_template_name == "c3" and global_props.cpu_codename == "INTEL_SKYLAKE":
         assert message in uvm.log_data
     else:
         assert message not in uvm.log_data