derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Fix errors in arm switcheroo

Browse Source 
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 <jason@lowepower.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/63851
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
This commit is contained in:
Jason Lowe-Power
2022-09-26 09:48:03 -07:00
committed by Jason Lowe-Power
parent d000ccf738
commit a12ac1a877
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/gem5/configs/realview-switcheroo-o3.py
View File

@@ -41,7 +41,7 @@ root = LinuxArmFSSwitcheroo(
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

2
tests/gem5/configs/realview64-switcheroo-o3.py
View File

@@ -38,7 +38,7 @@ from arm_generic import *
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