Skip to content

Commit 1de16b3

Browse files
committed
test: test ARM CPU templates in Linux host 5.10
Add the SVE CPU template as a valid template in 5.10 since it works. Signed-off-by: Pablo Barbáchano <[email protected]>
1 parent 5a23130 commit 1de16b3

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

tests/framework/utils_cpu_templates.py

+5-9
Original file line numberDiff line numberDiff line change
@@ -42,18 +42,12 @@ def get_supported_cpu_templates():
4242

4343
SUPPORTED_CPU_TEMPLATES = get_supported_cpu_templates()
4444

45-
# Custom CPU templates for Aarch64 for testing
46-
AARCH64_CUSTOM_CPU_TEMPLATES_G2 = ["v1n1"]
47-
AARCH64_CUSTOM_CPU_TEMPLATES_G3 = [
48-
"aarch64_with_sve_and_pac",
49-
"v1n1",
50-
]
51-
5245

5346
def get_supported_custom_cpu_templates():
5447
"""
5548
Return the list of custom CPU templates supported by the platform.
5649
"""
50+
# pylint:disable=too-many-return-statements
5751
host_linux = global_props.host_linux_version_tpl
5852

5953
match get_cpu_vendor(), global_props.cpu_codename:
@@ -65,9 +59,11 @@ def get_supported_custom_cpu_templates():
6559
case CpuVendor.AMD, _:
6660
return AMD_TEMPLATES
6761
case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_N1 if host_linux >= (6, 1):
68-
return AARCH64_CUSTOM_CPU_TEMPLATES_G2
62+
return ["v1n1"]
6963
case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_V1 if host_linux >= (6, 1):
70-
return AARCH64_CUSTOM_CPU_TEMPLATES_G3
64+
return ["v1n1", "aarch64_with_sve_and_pac"]
65+
case CpuVendor.ARM, CpuModel.ARM_NEOVERSE_V1:
66+
return ["aarch64_with_sve_and_pac"]
7167
case _:
7268
return []
7369

0 commit comments

Comments
 (0)