Skip to content

Commit 81bae9f

Browse files
JackThomson2roypat
authored andcommitted
Add support for M7a in testing utils
Add support for detection on m7a instance and prevent the test failure from missing cpu config test Signed-off-by: Jack Thomson <[email protected]>
1 parent d27e697 commit 81bae9f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

tests/framework/utils_cpuid.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class CpuModel(str, Enum):
2525
"""CPU models"""
2626

2727
AMD_MILAN = "AMD_MILAN"
28+
AMD_GENOA = "AMD_GENOA"
2829
ARM_NEOVERSE_N1 = "ARM_NEOVERSE_N1"
2930
ARM_NEOVERSE_V1 = "ARM_NEOVERSE_V1"
3031
INTEL_SKYLAKE = "INTEL_SKYLAKE"
@@ -39,9 +40,7 @@ class CpuModel(str, Enum):
3940
"Intel(R) Xeon(R) Platinum 8259CL CPU": "INTEL_CASCADELAKE",
4041
"Intel(R) Xeon(R) Platinum 8375C CPU": "INTEL_ICELAKE",
4142
},
42-
CpuVendor.AMD: {
43-
"AMD EPYC 7R13": "AMD_MILAN",
44-
},
43+
CpuVendor.AMD: {"AMD EPYC 7R13": "AMD_MILAN", "AMD EPYC 9R14": "AMD_GENOA"},
4544
CpuVendor.ARM: {"0xd0c": "ARM_NEOVERSE_N1", "0xd40": "ARM_NEOVERSE_V1"},
4645
}
4746

tests/integration_tests/functional/test_cpu_features_x86_64.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,14 @@ def test_host_vs_guest_cpu_features_x86_64(uvm_nano):
486486
"hypervisor",
487487
"tsc_known_freq",
488488
}
489+
case CpuModel.AMD_GENOA:
490+
# Return here to allow the test to pass until CPU features to enable are confirmed
491+
return
489492
case _:
490493
if os.environ.get("BUILDKITE") is not None:
491-
assert False, f"Cpu model {cpu_model} is not supported"
494+
assert (
495+
guest_feats == host_feats
496+
), f"Cpu model {cpu_model} is not supported"
492497

493498

494499
# From the `Intel® 64 Architecture x2APIC Specification`

0 commit comments

Comments
 (0)