Jason Lowe-Power has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/63851?usp=email )
Change subject: tests: Fix errors in arm switcheroo
......................................................................
tests: Fix errors in arm switcheroo
When switching to the all target, there is no longer a "DerivO3CPU" we
now need to drop the "Deriv"
Note that there are still some cases where it is valid to use "DerivO3"
where it is converted to drop the "Deriv" via a map.
Cleaning this up further is for future work.
Change-Id: Ide59eb3a5c7daf15c13afe395409f588562c1b54
Signed-off-by: Jason Lowe-Power <ja...@lowepower.com>
---
M tests/gem5/configs/realview-switcheroo-o3.py
M tests/gem5/configs/realview64-switcheroo-o3.py
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/tests/gem5/configs/realview-switcheroo-o3.py
b/tests/gem5/configs/realview-switcheroo-o3.py
index fe3298f..4fca57e 100644
--- a/tests/gem5/configs/realview-switcheroo-o3.py
+++ b/tests/gem5/configs/realview-switcheroo-o3.py
@@ -41,7 +41,7 @@
aarch64_kernel=False,
machine_type="VExpress_GEM5_V1",
mem_class=DDR3_1600_8x8,
- cpu_classes=(ArmDerivO3CPU, ArmDerivO3CPU),
+ cpu_classes=(ArmO3CPU, ArmO3CPU),
).create_root()
# Setup a custom test method that uses the switcheroo tester that
diff --git a/tests/gem5/configs/realview64-switcheroo-o3.py
b/tests/gem5/configs/realview64-switcheroo-o3.py
index ddfc73a..f899337 100644
--- a/tests/gem5/configs/realview64-switcheroo-o3.py
+++ b/tests/gem5/configs/realview64-switcheroo-o3.py
@@ -38,7 +38,7 @@
import switcheroo
root = LinuxArmFSSwitcheroo(
- mem_class=DDR3_1600_8x8, cpu_classes=(ArmDerivO3CPU, ArmDerivO3CPU)
+ mem_class=DDR3_1600_8x8, cpu_classes=(ArmO3CPU, ArmO3CPU)
).create_root()
# Setup a custom test method that uses the switcheroo tester that
--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/63851?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: Ide59eb3a5c7daf15c13afe395409f588562c1b54
Gerrit-Change-Number: 63851
Gerrit-PatchSet: 1
Gerrit-Owner: Jason Lowe-Power <power...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
