From 3212bdf3a89addef371bd7d3f43c322b002644db Mon Sep 17 00:00:00 2001 From: Andreas Sandberg Date: Mon, 26 Jun 2017 14:35:17 +0100 Subject: config: Move core timing models to config/common/cores Change-Id: I189b6462cc64f7cc6c1b7a6c2af1abb60e1854de Signed-off-by: Andreas Sandberg Reviewed-by: Gabor Dozsa Reviewed-on: https://gem5-review.googlesource.com/3943 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power --- tests/configs/arm_generic.py | 2 +- tests/configs/o3-timing-mt.py | 2 +- tests/configs/o3-timing.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/configs/arm_generic.py b/tests/configs/arm_generic.py index 86ad5d7a6..722749cb5 100644 --- a/tests/configs/arm_generic.py +++ b/tests/configs/arm_generic.py @@ -43,7 +43,7 @@ m5.util.addToPath('../configs/') from common import FSConfig from common.Caches import * from base_config import * -from common.O3_ARM_v7a import * +from common.cores.arm.O3_ARM_v7a import * from common.Benchmarks import SysConfig class ArmSESystemUniprocessor(BaseSESystemUniprocessor): diff --git a/tests/configs/o3-timing-mt.py b/tests/configs/o3-timing-mt.py index 7a829bb05..c45510bf2 100644 --- a/tests/configs/o3-timing-mt.py +++ b/tests/configs/o3-timing-mt.py @@ -42,7 +42,7 @@ from m5.objects import * from m5.defines import buildEnv from base_config import * from arm_generic import * -from common.O3_ARM_v7a import O3_ARM_v7a_3 +from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3 # If we are running ARM regressions, use a more sensible CPU # configuration. This makes the results more meaningful, and also diff --git a/tests/configs/o3-timing.py b/tests/configs/o3-timing.py index 050e4050e..b9a518107 100644 --- a/tests/configs/o3-timing.py +++ b/tests/configs/o3-timing.py @@ -42,7 +42,7 @@ from m5.objects import * from m5.defines import buildEnv from base_config import * from arm_generic import * -from common.O3_ARM_v7a import O3_ARM_v7a_3 +from common.cores.arm.O3_ARM_v7a import O3_ARM_v7a_3 # If we are running ARM regressions, use a more sensible CPU # configuration. This makes the results more meaningful, and also -- cgit v1.2.3