Skip to content

Commit

Permalink
Add support for M7a in testing utils
Browse files Browse the repository at this point in the history
Add support for detection on m7a instance and prevent the test
failure from missing cpu config test

Signed-off-by: Jack Thomson <[email protected]>
  • Loading branch information
JackThomson2 committed Dec 2, 2024
1 parent f304682 commit 6c57147
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 2 additions & 3 deletions tests/framework/utils_cpuid.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class CpuModel(str, Enum):
"""CPU models"""

AMD_MILAN = "AMD_MILAN"
AMD_GENOA = "AMD_GENOA"
ARM_NEOVERSE_N1 = "ARM_NEOVERSE_N1"
ARM_NEOVERSE_V1 = "ARM_NEOVERSE_V1"
INTEL_SKYLAKE = "INTEL_SKYLAKE"
Expand All @@ -39,9 +40,7 @@ class CpuModel(str, Enum):
"Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE",
"Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE",
},
CpuVendor.AMD: {
"AMD EPYC 7R13": "AMD_MILAN",
},
CpuVendor.AMD: {"AMD EPYC 7R13": "AMD_MILAN", "AMD EPYC 9R14": "AMD_GENOA"},
CpuVendor.ARM: {"0xd0c": "ARM_NEOVERSE_N1", "0xd40": "ARM_NEOVERSE_V1"},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,9 @@ def test_host_vs_guest_cpu_features_x86_64(uvm_nano):
"hypervisor",
"tsc_known_freq",
}
case CpuModel.AMD_GENOA:
# Return here to allow the test to pass until CPU features to enable are confirmed
return
case _:
if os.environ.get("BUILDKITE") is not None:
assert False, f"Cpu model {cpu_model} is not supported"
Expand Down

0 comments on commit 6c57147

Please sign in to comment.