Jason Lowe-Power has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/63852?usp=email )
Change subject: tests: Move the arm+ruby tests to not use ALL
......................................................................
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 <ja...@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63852
Tested-by: kokoro <noreply+kok...@google.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Reviewed-by: Bobby Bruce <bbr...@ucdavis.edu>
---
M tests/gem5/fs/linux/arm/test.py
1 file changed, 43 insertions(+), 4 deletions(-)
Approvals:
Bobby Bruce: Looks good to me, approved
kokoro: Regressions pass
Jason Lowe-Power: Looks good to me, approved
diff --git a/tests/gem5/fs/linux/arm/test.py
b/tests/gem5/fs/linux/arm/test.py
index dff2e74..8700247 100644
--- a/tests/gem5/fs/linux/arm/test.py
+++ b/tests/gem5/fs/linux/arm/test.py
@@ -73,10 +73,6 @@
"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 @@
#'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 @@
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,
+ )
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/63852?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I7942177fffd2bbfb0696b67c1e94e2ec30d8178b
Gerrit-Change-Number: 63852
Gerrit-PatchSet: 2
Gerrit-Owner: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
