tests: refactor test_cpu_features_aarch64 to use uvm_any

Use the new uvm_any fixture to make the tests simpler

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

Author: pb8o

tests/framework/utils_cpu_templates.py

@@ -22,9 +22,7 @@
 
 
 def get_supported_cpu_templates():
-    """
-    Return the list of CPU templates supported by the platform.
-    """
+    """Return the list of static CPU templates supported by the platform."""
     host_linux = global_props.host_linux_version_tpl
     match get_cpu_vendor(), global_props.cpu_codename:
         # T2CL template is only supported on Cascade Lake and newer CPUs.
@@ -44,12 +42,8 @@ def get_supported_cpu_templates():
 
 
 def get_supported_custom_cpu_templates():
-    """
-    Return the list of custom CPU templates supported by the platform.
-    """
-    # pylint:disable=too-many-return-statements
+    """Return the list of custom CPU templates supported by the platform."""
     host_linux = global_props.host_linux_version_tpl
-
     match get_cpu_vendor(), global_props.cpu_codename:
         # T2CL template is only supported on Cascade Lake and newer CPUs.
         case CpuVendor.INTEL, CpuModel.INTEL_SKYLAKE:

tests/integration_tests/functional/test_cpu_features_aarch64.py

@@ -3,83 +3,63 @@
 """Tests for the CPU features for aarch64."""
 
 import os
-import platform
-import re
 
 import pytest
 
-import framework.utils_cpuid as cpuid_utils
 from framework import utils
 from framework.properties import global_props
 from framework.utils_cpuid import CPU_FEATURES_CMD, CpuModel
 
-PLATFORM = platform.machine()
+pytestmark = pytest.mark.skipif(
+    global_props.cpu_architecture != "aarch64", reason="Only run in aarch64"
+)
 
-DEFAULT_G2_FEATURES = set(
+G2_FEATS = set(
     (
         "fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics fphp "
         "asimdhp cpuid asimdrdm lrcpc dcpop asimddp ssbs"
-    ).split(" ")
+    ).split()
 )
 
-DEFAULT_G3_FEATURES_5_10 = DEFAULT_G2_FEATURES | set(
-    "sha512 asimdfhm dit uscat ilrcpc flagm jscvt fcma sha3 sm3 sm4 rng dcpodp i8mm bf16 dgh".split(
-        " "
-    )
+G3_FEATS = G2_FEATS | set(
+    "sha512 asimdfhm dit uscat ilrcpc flagm jscvt fcma sha3 sm3 sm4 rng dcpodp i8mm bf16 dgh".split()
 )
 
-DEFAULT_G3_FEATURES_WITH_SVE_AND_PAC_5_10 = DEFAULT_G3_FEATURES_5_10 | set(
-    "paca pacg sve svebf16 svei8mm".split(" ")
-)
+G3_SVE_AND_PAC = set("paca pacg sve svebf16 svei8mm".split())
 
-DEFAULT_G3_FEATURES_V1N1 = DEFAULT_G2_FEATURES
 
+def test_guest_cpu_features(uvm_any):
+    """Check the CPU features for a microvm with different CPU templates"""
 
-def _check_cpu_features_arm(test_microvm, guest_kv, template_name=None):
-    expected_cpu_features = {"Flags": []}
-    match cpuid_utils.get_cpu_model_name(), guest_kv, template_name:
-        case CpuModel.ARM_NEOVERSE_N1, _, "v1n1":
-            expected_cpu_features = DEFAULT_G2_FEATURES
-        case CpuModel.ARM_NEOVERSE_N1, _, None:
-            expected_cpu_features = DEFAULT_G2_FEATURES
+    vm = uvm_any
+    expected_cpu_features = set()
+    match global_props.cpu_model, vm.cpu_template_name:
+        case CpuModel.ARM_NEOVERSE_N1, "v1n1":
+            expected_cpu_features = G2_FEATS
+        case CpuModel.ARM_NEOVERSE_N1, None:
+            expected_cpu_features = G2_FEATS
 
         # [cm]7g with guest kernel 5.10 and later
-        case CpuModel.ARM_NEOVERSE_V1, _, "v1n1":
-            expected_cpu_features = DEFAULT_G3_FEATURES_V1N1
-        case CpuModel.ARM_NEOVERSE_V1, _, "aarch64_with_sve_and_pac":
-            expected_cpu_features = DEFAULT_G3_FEATURES_WITH_SVE_AND_PAC_5_10
-        case CpuModel.ARM_NEOVERSE_V1, _, None:
-            expected_cpu_features = DEFAULT_G3_FEATURES_5_10
-
-    _, stdout, _ = test_microvm.ssh.check_output(CPU_FEATURES_CMD)
-    flags = set(stdout.strip().split(" "))
-    assert flags == expected_cpu_features
+        case CpuModel.ARM_NEOVERSE_V1, "v1n1":
+            expected_cpu_features = G2_FEATS
+        case CpuModel.ARM_NEOVERSE_V1, "aarch64_with_sve_and_pac":
+            expected_cpu_features = G3_FEATS | G3_SVE_AND_PAC
+        case CpuModel.ARM_NEOVERSE_V1, None:
+            expected_cpu_features = G3_FEATS
 
+    guest_feats = set(vm.ssh.check_output(CPU_FEATURES_CMD).stdout.split())
+    assert guest_feats == expected_cpu_features
 
-def get_cpu_template_dir(cpu_template):
-    """
-    Utility function to return a valid string which will be used as
-    name of the directory where snapshot artifacts are stored during
-    snapshot test and loaded from during restore test.
 
-    """
-    return cpu_template if cpu_template else "none"
-
-
-@pytest.mark.skipif(
-    PLATFORM != "aarch64",
-    reason="This is aarch64 specific test.",
-)
-def test_host_vs_guest_cpu_features_aarch64(uvm_nano):
+def test_host_vs_guest_cpu_features(uvm_nano):
     """Check CPU features host vs guest"""
 
     vm = uvm_nano
     vm.add_net_iface()
     vm.start()
-    host_feats = set(utils.check_output(CPU_FEATURES_CMD).stdout.strip().split(" "))
-    guest_feats = set(vm.ssh.check_output(CPU_FEATURES_CMD).stdout.strip().split(" "))
-
-    cpu_model = cpuid_utils.get_cpu_model_name()
+    host_feats = set(utils.check_output(CPU_FEATURES_CMD).stdout.split())
+    guest_feats = set(vm.ssh.check_output(CPU_FEATURES_CMD).stdout.split())
+    cpu_model = global_props.cpu_model
     match cpu_model:
         case CpuModel.ARM_NEOVERSE_N1:
             expected_guest_minus_host = set()
@@ -141,79 +121,6 @@ def test_host_vs_guest_cpu_features_aarch64(uvm_nano):
             assert guest_feats - host_feats == expected_guest_minus_host
         case _:
             if os.environ.get("BUILDKITE") is not None:
-                assert False, f"Cpu model {cpu_model} is not supported"
-
-
-@pytest.mark.skipif(
-    PLATFORM != "aarch64",
-    reason="This is aarch64 specific test.",
-)
-def test_default_cpu_features(microvm_factory, guest_kernel, rootfs):
-    """
-    Check the CPU features for a microvm with the specified config.
-    """
-
-    vm = microvm_factory.build(guest_kernel, rootfs, monitor_memory=False)
-    vm.spawn()
-    vm.basic_config()
-    vm.add_net_iface()
-    vm.start()
-    guest_kv = re.search(r"vmlinux-(\d+\.\d+)", guest_kernel.name).group(1)
-    _check_cpu_features_arm(vm, guest_kv)
-
-
-@pytest.mark.skipif(
-    PLATFORM != "aarch64",
-    reason="This is aarch64 specific test.",
-)
-def test_cpu_features_with_static_template(
-    microvm_factory, guest_kernel, rootfs, cpu_template
-):
-    """
-    Check the CPU features for a microvm with the specified config.
-    """
-
-    vm = microvm_factory.build(guest_kernel, rootfs, monitor_memory=False)
-    vm.spawn()
-    vm.basic_config(cpu_template=cpu_template)
-    vm.add_net_iface()
-    vm.start()
-    guest_kv = re.search(r"vmlinux-(\d+\.\d+)", guest_kernel.name).group(1)
-    _check_cpu_features_arm(vm, guest_kv, "v1n1")
-
-    # Check that cpu features are still correct
-    # after snap/restore cycle.
-    snapshot = vm.snapshot_full()
-    restored_vm = microvm_factory.build()
-    restored_vm.spawn()
-    restored_vm.restore_from_snapshot(snapshot, resume=True)
-    _check_cpu_features_arm(restored_vm, guest_kv, "v1n1")
-
-
-@pytest.mark.skipif(
-    PLATFORM != "aarch64",
-    reason="This is aarch64 specific test.",
-)
-def test_cpu_features_with_custom_template(
-    microvm_factory, guest_kernel, rootfs, custom_cpu_template
-):
-    """
-    Check the CPU features for a microvm with the specified config.
-    """
-
-    vm = microvm_factory.build(guest_kernel, rootfs, monitor_memory=False)
-    vm.spawn()
-    vm.basic_config()
-    vm.api.cpu_config.put(**custom_cpu_template["template"])
-    vm.add_net_iface()
-    vm.start()
-    guest_kv = re.search(r"vmlinux-(\d+\.\d+)", guest_kernel.name).group(1)
-    _check_cpu_features_arm(vm, guest_kv, custom_cpu_template["name"])
-
-    # Check that cpu features are still correct
-    # after snap/restore cycle.
-    snapshot = vm.snapshot_full()
-    restored_vm = microvm_factory.build()
-    restored_vm.spawn()
-    restored_vm.restore_from_snapshot(snapshot, resume=True)
-    _check_cpu_features_arm(restored_vm, guest_kv, custom_cpu_template["name"])
+                assert (
+                    False
+                ), f"Cpu model {cpu_model} is not supported, please onboard it."