Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Add support for M7a detection in tests #4939

Merged
merged 1 commit into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,9 +486,14 @@ 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
pb8o marked this conversation as resolved.
Show resolved Hide resolved
case _:
if os.environ.get("BUILDKITE") is not None:
assert False, f"Cpu model {cpu_model} is not supported"
assert (
guest_feats == host_feats
), f"Cpu model {cpu_model} is not supported"


# From the `Intel® 64 Architecture x2APIC Specification`
Expand Down
Loading