[gem5-dev] Change in gem5/gem5[develop]: tests: Moved realview config files
Bobby R. Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/33143 )
Change subject: tests: Moved realview config files
..
tests: Moved realview config files
This is part of a process of getting rid of the `tests/config`
directory, and placing these configs either where they are used,
removing them if unneeded, or moving them to `configs/example`.
These config files, in this patchset, are part of the realview tests
found in `tests/gem5/fs/linux/arm/`. They have been moved to
`tests/gem5/configs`.
Change-Id: I7706b59c58da6413f5f3dd816a1e5cd54a834a58
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33143
Reviewed-by: Bobby R. Bruce
Maintainer: Bobby R. Bruce
Tested-by: kokoro
---
R tests/gem5/configs/arm_generic.py
R tests/gem5/configs/base_config.py
R tests/gem5/configs/checkpoint.py
R tests/gem5/configs/realview-minor-dual.py
R tests/gem5/configs/realview-minor.py
R tests/gem5/configs/realview-o3-checker.py
R tests/gem5/configs/realview-o3-dual.py
R tests/gem5/configs/realview-o3.py
R tests/gem5/configs/realview-simple-atomic-checkpoint.py
R tests/gem5/configs/realview-simple-atomic-dual.py
R tests/gem5/configs/realview-simple-atomic.py
R tests/gem5/configs/realview-simple-timing-dual-ruby.py
R tests/gem5/configs/realview-simple-timing-dual.py
R tests/gem5/configs/realview-simple-timing-ruby.py
R tests/gem5/configs/realview-simple-timing.py
R tests/gem5/configs/realview-switcheroo-atomic.py
R tests/gem5/configs/realview-switcheroo-full.py
R tests/gem5/configs/realview-switcheroo-noncaching-timing.py
R tests/gem5/configs/realview-switcheroo-o3.py
R tests/gem5/configs/realview-switcheroo-timing.py
R tests/gem5/configs/realview64-minor-dual.py
R tests/gem5/configs/realview64-minor.py
R tests/gem5/configs/realview64-o3-checker.py
R tests/gem5/configs/realview64-o3-dual.py
R tests/gem5/configs/realview64-o3.py
R tests/gem5/configs/realview64-simple-atomic-checkpoint.py
R tests/gem5/configs/realview64-simple-atomic-dual.py
R tests/gem5/configs/realview64-simple-atomic.py
R tests/gem5/configs/realview64-simple-timing-dual-ruby.py
R tests/gem5/configs/realview64-simple-timing-dual.py
R tests/gem5/configs/realview64-simple-timing-ruby.py
R tests/gem5/configs/realview64-simple-timing.py
R tests/gem5/configs/realview64-switcheroo-atomic.py
R tests/gem5/configs/realview64-switcheroo-full.py
R tests/gem5/configs/realview64-switcheroo-o3.py
R tests/gem5/configs/realview64-switcheroo-timing.py
R tests/gem5/configs/switcheroo.py
M tests/gem5/fs/linux/arm/run.py
M tests/gem5/fs/linux/arm/test.py
39 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/tests/configs/arm_generic.py
b/tests/gem5/configs/arm_generic.py
similarity index 100%
rename from tests/configs/arm_generic.py
rename to tests/gem5/configs/arm_generic.py
diff --git a/tests/configs/base_config.py
b/tests/gem5/configs/base_config.py
similarity index 99%
rename from tests/configs/base_config.py
rename to tests/gem5/configs/base_config.py
index b124a13..b5bddf4 100644
--- a/tests/configs/base_config.py
+++ b/tests/gem5/configs/base_config.py
@@ -38,7 +38,6 @@
import m5
from m5.objects import *
from m5.proxy import *
-m5.util.addToPath('../configs/')
from common import FSConfig
from common import Options
from common.Caches import *
diff --git a/tests/configs/checkpoint.py b/tests/gem5/configs/checkpoint.py
similarity index 100%
rename from tests/configs/checkpoint.py
rename to tests/gem5/configs/checkpoint.py
diff --git a/tests/configs/realview-minor-dual.py
b/tests/gem5/configs/realview-minor-dual.py
similarity index 100%
rename from tests/configs/realview-minor-dual.py
rename to tests/gem5/configs/realview-minor-dual.py
diff --git a/tests/configs/realview-minor.py
b/tests/gem5/configs/realview-minor.py
similarity index 100%
rename from tests/configs/realview-minor.py
rename to tests/gem5/configs/realview-minor.py
diff --git a/tests/configs/realview-o3-checker.py
b/tests/gem5/configs/realview-o3-checker.py
similarity index 100%
rename from tests/configs/realview-o3-checker.py
rename to tests/gem5/configs/realview-o3-checker.py
diff --git a/tests/configs/realview-o3-dual.py
b/tests/gem5/configs/realview-o3-dual.py
similarity index 100%
rename from tests/configs/realview-o3-dual.py
rename to tests/gem5/configs/realview-o3-dual.py
diff --git a/tests/configs/realview-o3.py
b/tests/gem5/configs/realview-o3.py
similarity index 100%
rename from tests/configs/realview-o3.py
rename to tests/gem5/configs/realview-o3.py
diff --git a/tests/configs/realview-simple-atomic-checkpoint.py
b/tests/gem5/configs/realview-simple-atomic-checkpoint.py
similarity index 100%
rename from tests/configs/realview-simple-atomic-checkpoint.py
rename to tests/gem5/configs/realview-simple-atomic-checkpoint.py
diff
[gem5-dev] Change in gem5/gem5[develop]: tests: Moved realview config files
Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/33143 )
Change subject: tests: Moved realview config files
..
tests: Moved realview config files
This is part of a process of getting rid of the `tests/config`
directory, and placing these configs either where they are used,
removing them if unneeded, or moving them to `configs/example`.
These config files, in this patchset, are part of the realview tests
found in `tests/gem5/fs/linux/arm/`. They have therefore been moved
there.
Change-Id: I7706b59c58da6413f5f3dd816a1e5cd54a834a58
---
R configs/example/base_arm_config.py
M tests/configs/minor-timing-mp.py
M tests/configs/minor-timing.py
M tests/configs/o3-timing-checker.py
M tests/configs/o3-timing-mp.py
M tests/configs/o3-timing-mt.py
M tests/configs/o3-timing.py
M tests/configs/simple-atomic-dummychecker.py
M tests/configs/simple-atomic-mp.py
M tests/configs/simple-atomic.py
M tests/configs/simple-timing-mp.py
M tests/configs/simple-timing.py
M tests/configs/x86_generic.py
R tests/gem5/fs/linux/arm/configs/arm_generic.py
R tests/gem5/fs/linux/arm/configs/checkpoint.py
R tests/gem5/fs/linux/arm/configs/realview-minor-dual.py
R tests/gem5/fs/linux/arm/configs/realview-minor.py
R tests/gem5/fs/linux/arm/configs/realview-o3-checker.py
R tests/gem5/fs/linux/arm/configs/realview-o3-dual.py
R tests/gem5/fs/linux/arm/configs/realview-o3.py
R tests/gem5/fs/linux/arm/configs/realview-simple-atomic-checkpoint.py
R tests/gem5/fs/linux/arm/configs/realview-simple-atomic-dual.py
R tests/gem5/fs/linux/arm/configs/realview-simple-atomic.py
R tests/gem5/fs/linux/arm/configs/realview-simple-timing-dual-ruby.py
R tests/gem5/fs/linux/arm/configs/realview-simple-timing-dual.py
R tests/gem5/fs/linux/arm/configs/realview-simple-timing-ruby.py
R tests/gem5/fs/linux/arm/configs/realview-simple-timing.py
R tests/gem5/fs/linux/arm/configs/realview-switcheroo-atomic.py
R tests/gem5/fs/linux/arm/configs/realview-switcheroo-full.py
R tests/gem5/fs/linux/arm/configs/realview-switcheroo-noncaching-timing.py
R tests/gem5/fs/linux/arm/configs/realview-switcheroo-o3.py
R tests/gem5/fs/linux/arm/configs/realview-switcheroo-timing.py
R tests/gem5/fs/linux/arm/configs/realview64-minor-dual.py
R tests/gem5/fs/linux/arm/configs/realview64-minor.py
R tests/gem5/fs/linux/arm/configs/realview64-o3-checker.py
R tests/gem5/fs/linux/arm/configs/realview64-o3-dual.py
R tests/gem5/fs/linux/arm/configs/realview64-o3.py
R tests/gem5/fs/linux/arm/configs/realview64-simple-atomic-checkpoint.py
R tests/gem5/fs/linux/arm/configs/realview64-simple-atomic-dual.py
R tests/gem5/fs/linux/arm/configs/realview64-simple-atomic.py
R tests/gem5/fs/linux/arm/configs/realview64-simple-timing-dual-ruby.py
R tests/gem5/fs/linux/arm/configs/realview64-simple-timing-dual.py
R tests/gem5/fs/linux/arm/configs/realview64-simple-timing-ruby.py
R tests/gem5/fs/linux/arm/configs/realview64-simple-timing.py
R tests/gem5/fs/linux/arm/configs/realview64-switcheroo-atomic.py
R tests/gem5/fs/linux/arm/configs/realview64-switcheroo-full.py
R tests/gem5/fs/linux/arm/configs/realview64-switcheroo-o3.py
R tests/gem5/fs/linux/arm/configs/realview64-switcheroo-timing.py
R tests/gem5/fs/linux/arm/configs/switcheroo.py
M tests/gem5/fs/linux/arm/run.py
M tests/gem5/fs/linux/arm/test.py
51 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/tests/configs/base_config.py
b/configs/example/base_arm_config.py
similarity index 99%
rename from tests/configs/base_config.py
rename to configs/example/base_arm_config.py
index b124a13..b5bddf4 100644
--- a/tests/configs/base_config.py
+++ b/configs/example/base_arm_config.py
@@ -38,7 +38,6 @@
import m5
from m5.objects import *
from m5.proxy import *
-m5.util.addToPath('../configs/')
from common import FSConfig
from common import Options
from common.Caches import *
diff --git a/tests/configs/minor-timing-mp.py
b/tests/configs/minor-timing-mp.py
index 4283c3f..100edab 100644
--- a/tests/configs/minor-timing-mp.py
+++ b/tests/configs/minor-timing-mp.py
@@ -37,7 +37,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from m5.objects import *
-from base_config import *
+from base_arm_config import *
nb_cores = 4
root = BaseSESystem(mem_mode='timing', mem_class=DDR3_1600_8x8,
diff --git a/tests/configs/minor-timing.py b/tests/configs/minor-timing.py
index 6c1b517..71f6a0f 100644
--- a/tests/configs/minor-timing.py
+++ b/tests/configs/minor-timing.py
@@ -37,7 +37,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from m5.objects import *
-from base_config import *
+from base_arm_config import *
root = BaseSESystemUniprocessor(mem_mode='timing', mem_class=DDR3_1600_8x8,
cpu_class=MinorCPU).create_root()
diff --git a/tests/configs/o3-timing-checker.py
b/tests/configs/o3-timing-checker.py
index c82a6c8..b0d4155
