diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-08-16 09:52:05 -0700 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-08-16 09:52:05 -0700 |
commit | 2552e68eb6bd66f4d2e634c465fa3868bb8cee0e (patch) | |
tree | b654ce30323d504d91fdee3623ae4fc2e191fe53 /configs/test | |
parent | bb9d2c345791331916df482f23173e6b5f5bf804 (diff) | |
download | gem5-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/test')
-rw-r--r-- | configs/test/fs.py | 12 | ||||
-rwxr-xr-x | configs/test/hello | bin | 312176 -> 0 bytes | |||
-rwxr-xr-x | configs/test/hello_mips | bin | 837626 -> 0 bytes | |||
-rwxr-xr-x | configs/test/sparc_tests/hello_sparc | bin | 644149 -> 0 bytes |
4 files changed, 7 insertions, 5 deletions
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 Binary files differdeleted file mode 100755 index 59c0d195c..000000000 --- a/configs/test/hello +++ /dev/null diff --git a/configs/test/hello_mips b/configs/test/hello_mips Binary files differdeleted file mode 100755 index a3db001ec..000000000 --- a/configs/test/hello_mips +++ /dev/null diff --git a/configs/test/sparc_tests/hello_sparc b/configs/test/sparc_tests/hello_sparc Binary files differdeleted file mode 100755 index e254ae33f..000000000 --- a/configs/test/sparc_tests/hello_sparc +++ /dev/null |