tests: Add 'kvm' tag to tests

Some of our tests require KVM. Tagging these tests as such allow us to
filter them in or out during testing.

Change-Id: I3f188d3e268409535043cc32b64d99e4657638cd
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56829
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Bobby R. Bruce
2022-02-14 14:52:35 -08:00
committed by Bobby Bruce
parent d7854cce3b
commit 2f48aa9e5c
7 changed files with 22 additions and 3 deletions

View File

@@ -135,7 +135,8 @@ for name in arm_fs_quick_tests:
valid_isas=(constants.arm_tag,),
length=constants.quick_tag,
valid_hosts=valid_hosts,
fixtures=(arm_fs_binaries,)
fixtures=(arm_fs_binaries,),
uses_kvm= name in arm_fs_kvm_tests,
)
for name in arm_fs_long_tests:
@@ -151,5 +152,6 @@ for name in arm_fs_long_tests:
config_args=args,
valid_isas=(constants.arm_tag,),
length=constants.long_tag,
fixtures=(arm_fs_binaries,)
fixtures=(arm_fs_binaries,),
uses_kvm= name in arm_fs_kvm_tests,
)

View File

@@ -70,6 +70,7 @@ if os.access("/dev/kvm", mode=os.R_OK | os.W_OK):
valid_isas=(constants.x86_tag,),
valid_hosts=constants.supported_hosts,
length=constants.long_tag,
uses_kvm=True,
)
gem5_verify_config(
@@ -108,6 +109,7 @@ if os.access("/dev/kvm", mode=os.R_OK | os.W_OK):
protocol="MESI_Two_Level",
valid_hosts=constants.supported_hosts,
length=constants.long_tag,
uses_kvm=True,
)
if os.access("/dev/kvm", mode=os.R_OK | os.W_OK):
@@ -135,6 +137,7 @@ if os.access("/dev/kvm", mode=os.R_OK | os.W_OK):
protocol="MESI_Two_Level",
valid_hosts=constants.supported_hosts,
length=constants.long_tag,
uses_kvm=True,
)
if os.access("/dev/kvm", mode=os.R_OK | os.W_OK):
@@ -156,6 +159,7 @@ if os.access("/dev/kvm", mode=os.R_OK | os.W_OK):
protocol="MESI_Two_Level",
valid_hosts=constants.supported_hosts,
length=constants.long_tag,
uses_kvm=True,
)
gem5_verify_config(

View File

@@ -89,6 +89,7 @@ def test_kvm_fork_run(cpu: str, num_cpus: int, mem_system: str, length: str):
valid_hosts=constants.supported_hosts,
protocol=protocol_to_use,
length=length,
uses_kvm=True,
)

View File

@@ -87,6 +87,7 @@ def test_kvm_switch(cpu: str, num_cpus: int, mem_system: str, length: str):
valid_hosts=constants.supported_hosts,
protocol=protocol_to_use,
length=length,
uses_kvm=True,
)

View File

@@ -88,6 +88,7 @@ def test_parsec(
valid_isas=(constants.x86_tag,),
valid_hosts=constants.supported_hosts,
length=length,
uses_kvm=True,
)

View File

@@ -59,7 +59,9 @@ def gem5_verify_config(name,
valid_variants=constants.supported_variants,
length=constants.supported_lengths[0],
valid_hosts=constants.supported_hosts,
protocol=None):
protocol=None,
uses_kvm=False,
):
'''
Helper class to generate common gem5 tests using verifiers.
@@ -84,6 +86,9 @@ def gem5_verify_config(name,
:param valid_variants: An iterable with the variant levels that
this test can be ran for. (E.g. opt, debug)
:param uses_kvm: States if this verifier uses KVM. If so, the "kvm" tag
will be included.
'''
fixtures = list(fixtures)
testsuites = []
@@ -123,6 +128,9 @@ def gem5_verify_config(name,
# Add the isa and variant to tags list.
tags = [isa, opt, length, host]
if uses_kvm:
tags.append(constants.kvm_tag)
# Create the gem5 target for the specific architecture and
# variant.
_fixtures = copy.copy(fixtures)