Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/58970 )
Change subject: tests: Fix 'valid_hosts' field for KVM tests
......................................................................
tests: Fix 'valid_hosts' field for KVM tests
In some cases where we wish to use X86 KVM the 'valid_hosts' field was
set to 'constants.supported_hosts'. This can cause problems as the only
valid host for an X86 KVM test is X86. This patch fixes this.
This fix will likely fix some flakey errors observed in the Nightly
tests.
Change-Id: Id0a906ca6602c0358ae632cce314769807bf6e07
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/58970
Reviewed-by: Jason Lowe-Power <power...@gmail.com>
Maintainer: Jason Lowe-Power <power...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py
M tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
M tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
M tests/gem5/parsec-benchmarks/test_parsec.py
4 files changed, 27 insertions(+), 7 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git
a/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py
b/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py
index f05bb6d..f90a077 100644
--- a/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py
+++ b/tests/gem5/gem5_library_example_tests/test_gem5_library_examples.py
@@ -68,7 +68,7 @@
),
config_args=[],
valid_isas=(constants.x86_tag,),
- valid_hosts=constants.supported_hosts,
+ valid_hosts=(constants.host_x86_64_tag,),
length=constants.long_tag,
uses_kvm=True,
)
@@ -107,7 +107,7 @@
config_args=["--benchmark","blackscholes","--size","simsmall"],
valid_isas=(constants.x86_tag,),
protocol="MESI_Two_Level",
- valid_hosts=constants.supported_hosts,
+ valid_hosts=(constants.host_x86_64_tag,),
length=constants.long_tag,
uses_kvm=True,
)
@@ -135,7 +135,7 @@
],
valid_isas=(constants.x86_tag,),
protocol="MESI_Two_Level",
- valid_hosts=constants.supported_hosts,
+ valid_hosts=(constants.host_x86_64_tag,),
length=constants.long_tag,
uses_kvm=True,
)
@@ -157,7 +157,7 @@
config_args=["--benchmark","bfs","--synthetic","1","--size","1"],
valid_isas=(constants.x86_tag,),
protocol="MESI_Two_Level",
- valid_hosts=constants.supported_hosts,
+ valid_hosts=(constants.host_x86_64_tag,),
length=constants.long_tag,
uses_kvm=True,
)
diff --git a/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
b/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
index ddb91c1..0ddc350 100644
--- a/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
+++ b/tests/gem5/kvm-fork-tests/test_kvm_fork_run.py
@@ -86,7 +86,7 @@
"--kernel-args=''",
],
valid_isas=(isa_to_use,),
- valid_hosts=constants.supported_hosts,
+ valid_hosts=(constants.host_x86_64_tag,),
protocol=protocol_to_use,
length=length,
uses_kvm=True,
diff --git a/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
b/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
index ffddaa0..4d501e4 100644
--- a/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
+++ b/tests/gem5/kvm-switch-tests/test_kvm_cpu_switch.py
@@ -84,7 +84,7 @@
"--kernel-args=''",
],
valid_isas=(isa_to_use,),
- valid_hosts=constants.supported_hosts,
+ valid_hosts=(constants.host_x86_64_tag,),
protocol=protocol_to_use,
length=length,
uses_kvm=True,
diff --git a/tests/gem5/parsec-benchmarks/test_parsec.py
b/tests/gem5/parsec-benchmarks/test_parsec.py
index b659046..1104cf1 100644
--- a/tests/gem5/parsec-benchmarks/test_parsec.py
+++ b/tests/gem5/parsec-benchmarks/test_parsec.py
@@ -86,7 +86,7 @@
resource_path,
],
valid_isas=(constants.x86_tag,),
- valid_hosts=constants.supported_hosts,
+ valid_hosts=(constants.host_x86_64_tag,),
length=length,
uses_kvm=True,
)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/58970
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: Id0a906ca6602c0358ae632cce314769807bf6e07
Gerrit-Change-Number: 58970
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Bobby Bruce <bbr...@ucdavis.edu>
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
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
