From 9145e2cfd4a16e57413a707676aef0fa862d9344 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Fri, 1 Nov 2013 11:56:14 -0400 Subject: [PATCH] test: Use SimpleMemory for atomic full-system tests Keep it simple and use the SimpleMemory rather than the DRAM controller model for atomic full-system tests. --- tests/configs/pc-simple-atomic.py | 2 +- tests/configs/realview-simple-atomic-dual.py | 2 +- tests/configs/realview-simple-atomic.py | 2 +- tests/configs/realview-switcheroo-atomic.py | 2 +- tests/configs/tsunami-simple-atomic-dual.py | 2 +- tests/configs/tsunami-simple-atomic.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/configs/pc-simple-atomic.py b/tests/configs/pc-simple-atomic.py index 94a06ed6f2..dba3821521 100644 --- a/tests/configs/pc-simple-atomic.py +++ b/tests/configs/pc-simple-atomic.py @@ -39,5 +39,5 @@ from m5.objects import * from x86_generic import * root = LinuxX86FSSystemUniprocessor(mem_mode='atomic', - mem_class=DDR3_1600_x64, + mem_class=SimpleMemory, cpu_class=AtomicSimpleCPU).create_root() diff --git a/tests/configs/realview-simple-atomic-dual.py b/tests/configs/realview-simple-atomic-dual.py index 0d6b11cf6c..32d66f6afa 100644 --- a/tests/configs/realview-simple-atomic-dual.py +++ b/tests/configs/realview-simple-atomic-dual.py @@ -39,6 +39,6 @@ from m5.objects import * from arm_generic import * root = LinuxArmFSSystem(mem_mode='atomic', - mem_class=DDR3_1600_x64, + mem_class=SimpleMemory, cpu_class=AtomicSimpleCPU, num_cpus=2).create_root() diff --git a/tests/configs/realview-simple-atomic.py b/tests/configs/realview-simple-atomic.py index a440de2912..b51954879c 100644 --- a/tests/configs/realview-simple-atomic.py +++ b/tests/configs/realview-simple-atomic.py @@ -39,6 +39,6 @@ from m5.objects import * from arm_generic import * root = LinuxArmFSSystemUniprocessor(mem_mode='atomic', - mem_class=DDR3_1600_x64, + mem_class=SimpleMemory, cpu_class=AtomicSimpleCPU).create_root() diff --git a/tests/configs/realview-switcheroo-atomic.py b/tests/configs/realview-switcheroo-atomic.py index bab11ebe64..abcfb5179d 100644 --- a/tests/configs/realview-switcheroo-atomic.py +++ b/tests/configs/realview-switcheroo-atomic.py @@ -40,7 +40,7 @@ from arm_generic import * import switcheroo root = LinuxArmFSSwitcheroo( - mem_class=DDR3_1600_x64, + mem_class=SimpleMemory, cpu_classes=(AtomicSimpleCPU, AtomicSimpleCPU) ).create_root() diff --git a/tests/configs/tsunami-simple-atomic-dual.py b/tests/configs/tsunami-simple-atomic-dual.py index 9f827d9d9c..f54015cd36 100644 --- a/tests/configs/tsunami-simple-atomic-dual.py +++ b/tests/configs/tsunami-simple-atomic-dual.py @@ -39,6 +39,6 @@ from m5.objects import * from alpha_generic import * root = LinuxAlphaFSSystem(mem_mode='atomic', - mem_class=DDR3_1600_x64, + mem_class=SimpleMemory, cpu_class=AtomicSimpleCPU, num_cpus=2).create_root() diff --git a/tests/configs/tsunami-simple-atomic.py b/tests/configs/tsunami-simple-atomic.py index 8c486204c9..0cc19e0924 100644 --- a/tests/configs/tsunami-simple-atomic.py +++ b/tests/configs/tsunami-simple-atomic.py @@ -39,5 +39,5 @@ from m5.objects import * from alpha_generic import * root = LinuxAlphaFSSystemUniprocessor(mem_mode='atomic', - mem_class=DDR3_1600_x64, + mem_class=SimpleMemory, cpu_class=AtomicSimpleCPU).create_root()