tests: Move the arm+ruby tests to not use ALL
The main Ruby.py script does not support the ALL target (it still depends on get_runtime_isa). So, instead of testing these with the all target, move them to be tested with just Arm built. Change-Id: I7942177fffd2bbfb0696b67c1e94e2ec30d8178b Signed-off-by: Jason Lowe-Power <jason@lowepower.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63852 Tested-by: kokoro <noreply+kokoro@google.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
This commit is contained in:
committed by
Jason Lowe-Power
parent
1dfd39499f
commit
c1de2b8762
@@ -73,10 +73,6 @@ arm_fs_long_tests = [
|
||||
"realview64-minor-dual",
|
||||
"realview64-switcheroo-o3",
|
||||
"realview64-switcheroo-full",
|
||||
"realview-simple-timing-ruby",
|
||||
"realview64-simple-timing-ruby",
|
||||
"realview64-simple-timing-dual-ruby",
|
||||
"realview64-o3-dual-ruby",
|
||||
# The following tests fail. These are recorded in the GEM5-640
|
||||
# Jira issue.
|
||||
#
|
||||
@@ -88,6 +84,14 @@ arm_fs_long_tests = [
|
||||
#'realview-simple-timing-dual-ruby',
|
||||
]
|
||||
|
||||
# These tests are Ruby-based and Ruby does not support multiple ISAs
|
||||
arm_fs_long_tests_arm_target = [
|
||||
"realview-simple-timing-ruby",
|
||||
"realview64-simple-timing-ruby",
|
||||
"realview64-simple-timing-dual-ruby",
|
||||
"realview64-o3-dual-ruby",
|
||||
]
|
||||
|
||||
tarball = "aarch-system-20220707.tar.bz2"
|
||||
url = config.resource_url + "/arm/" + tarball
|
||||
filepath = os.path.dirname(os.path.abspath(__file__))
|
||||
@@ -157,3 +161,20 @@ for name in arm_fs_long_tests:
|
||||
fixtures=(arm_fs_binaries,),
|
||||
uses_kvm=name in arm_fs_kvm_tests,
|
||||
)
|
||||
|
||||
for name in arm_fs_long_tests_arm_target:
|
||||
args = [
|
||||
joinpath(config.base_dir, "tests", "gem5", "configs", name + ".py"),
|
||||
path,
|
||||
config.base_dir,
|
||||
]
|
||||
gem5_verify_config(
|
||||
name=name,
|
||||
verifiers=verifier_list(name), # TODO: Add basic stat verifiers
|
||||
config=joinpath(filepath, "run.py"),
|
||||
config_args=args,
|
||||
valid_isas=(constants.arm_tag,),
|
||||
length=constants.long_tag,
|
||||
fixtures=(arm_fs_binaries,),
|
||||
uses_kvm=name in arm_fs_kvm_tests,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user