summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 09:52:05 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 09:52:05 -0700
commit2552e68eb6bd66f4d2e634c465fa3868bb8cee0e (patch)
treeb654ce30323d504d91fdee3623ae4fc2e191fe53 /configs
parentbb9d2c345791331916df482f23173e6b5f5bf804 (diff)
downloadgem5-2552e68eb6bd66f4d2e634c465fa3868bb8cee0e.tar.xz
More restructuring of regression tests.
Moving work back to zizzer... configs/common/FSConfig.py: configs/test/fs.py: Move CPU connections out of makeLinuxAlphaSystem() src/python/m5/objects/BaseCPU.py: Create default TLBs in full system. Move utility cache functions here. src/python/m5/objects/O3CPU.py: Add _mem_ports tests/run.py: Add binpath() Change maxtick default to 'forever' tests/simple-atomic.py: Use connectmemPorts() tests/simple-timing.py: Fix up. --HG-- rename : tests/quick/eio1/ref/alpha/eio/detailed/config.ini => tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini rename : tests/quick/eio1/ref/alpha/eio/detailed/config.out => tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out rename : tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt rename : tests/quick/eio1/ref/alpha/eio/detailed/stderr => tests/quick/20.eio-short/ref/alpha/eio/detailed/stderr rename : tests/quick/eio1/ref/alpha/eio/detailed/stdout => tests/quick/20.eio-short/ref/alpha/eio/detailed/stdout rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr rename : tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout => tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout rename : tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini rename : tests/quick/eio1/ref/alpha/eio/simple-timing/config.out => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out rename : tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt rename : tests/quick/eio1/ref/alpha/eio/simple-timing/stderr => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr rename : tests/quick/eio1/ref/alpha/eio/simple-timing/stdout => tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout rename : tests/quick/eio1/test.py => tests/quick/20.eio-short/test.py rename : configs/test/hello => tests/test-progs/hello/bin/alpha/linux/hello rename : configs/test/hello_mips => tests/test-progs/hello/bin/mips/linux/hello_mips rename : configs/test/sparc_tests/hello_sparc => tests/test-progs/hello/bin/sparc/bin extra : convert_revision : 1f891392ecc11ffcc3b3182fa673c401c0efc8a5
Diffstat (limited to 'configs')
-rw-r--r--configs/common/FSConfig.py9
-rw-r--r--configs/test/fs.py12
-rwxr-xr-xconfigs/test/hellobin312176 -> 0 bytes
-rwxr-xr-xconfigs/test/hello_mipsbin837626 -> 0 bytes
-rwxr-xr-xconfigs/test/sparc_tests/hello_sparcbin644149 -> 0 bytes
5 files changed, 8 insertions, 13 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index c6ad8ce48..7d62297a9 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -31,7 +31,6 @@ from m5 import makeList
from m5.objects import *
from Benchmarks import *
from FullO3Config import *
-from Util import *
class CowIdeDisk(IdeDisk):
image = CowDiskImage(child=RawDiskImage(read_only=True),
@@ -47,7 +46,7 @@ class BaseTsunami(Tsunami):
ide = IdeController(disks=[Parent.disk0, Parent.disk2],
pci_func=0, pci_dev=0, pci_bus=0)
-def makeLinuxAlphaSystem(cpu, mem_mode, mdesc, icache=None, dcache=None, l2cache=None):
+def makeLinuxAlphaSystem(mem_mode, mdesc):
self = LinuxAlphaSystem()
self.readfile = mdesc.script()
self.iobus = Bus(bus_id=0)
@@ -72,13 +71,7 @@ def makeLinuxAlphaSystem(cpu, mem_mode, mdesc, icache=None, dcache=None, l2cache
self.simple_disk = SimpleDisk(disk=RawDiskImage(image_file = mdesc.disk(),
read_only = True))
self.intrctrl = IntrControl()
- self.cpu = cpu
self.mem_mode = mem_mode
- connectCpu(self.cpu, self.membus, icache, dcache, l2cache)
- for each_cpu in makeList(self.cpu):
- each_cpu.itb = AlphaITB()
- each_cpu.dtb = AlphaDTB()
- self.cpu.clock = '2GHz'
self.sim_console = SimConsole(listener=ConsoleListener(port=3456))
self.kernel = binary('vmlinux')
self.pal = binary('ts_osfpal')
diff --git a/configs/test/fs.py b/configs/test/fs.py
index 8686cdb5b..4a3876b36 100644
--- a/configs/test/fs.py
+++ b/configs/test/fs.py
@@ -5,7 +5,6 @@ from m5.objects import *
m5.AddToPath('../common')
from FSConfig import *
from SysPaths import *
-from Util import *
from Benchmarks import *
parser = optparse.OptionParser()
@@ -50,12 +49,15 @@ if options.benchmark:
bm = Benchmarks[options.benchmark]
if len(bm) == 2:
- root = makeDualRoot(makeLinuxAlphaSystem(cpu, mem_mode, bm[0]),
- makeLinuxAlphaSystem(cpu2, mem_mode, bm[1]))
-
+ s1 = makeLinuxAlphaSystem(mem_mode, bm[0])
+ s2 = makeLinuxAlphaSystem(mem_mode, bm[1])
+ cpu.connectMemPorts(s1.membus)
+ cpu2.connectMemPorts(s2.membus)
+ root = makeDualRoot(s1, s2)
elif len(bm) == 1:
root = Root(clock = '1THz',
- system = makeLinuxAlphaSystem(cpu, mem_mode, bm[0]))
+ system = makeLinuxAlphaSystem(mem_mode, bm[0]))
+ cpu.connectMemPorts(root.system.membus)
else:
print "Error I don't know how to create more than 2 systems."
sys.exit(1)
diff --git a/configs/test/hello b/configs/test/hello
deleted file mode 100755
index 59c0d195c..000000000
--- a/configs/test/hello
+++ /dev/null
Binary files differ
diff --git a/configs/test/hello_mips b/configs/test/hello_mips
deleted file mode 100755
index a3db001ec..000000000
--- a/configs/test/hello_mips
+++ /dev/null
Binary files differ
diff --git a/configs/test/sparc_tests/hello_sparc b/configs/test/sparc_tests/hello_sparc
deleted file mode 100755
index e254ae33f..000000000
--- a/configs/test/sparc_tests/hello_sparc
+++ /dev/null
Binary files differ