diff options
Diffstat (limited to 'tests')
33 files changed, 78 insertions, 12 deletions
diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr diff --git a/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt b/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr diff --git a/tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr diff --git a/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout diff --git a/tests/quick/00.hello/test.py b/tests/quick/00.hello/test.py new file mode 100644 index 000000000..fd8fd5abd --- /dev/null +++ b/tests/quick/00.hello/test.py @@ -0,0 +1,29 @@ +# Copyright (c) 2006 The Regents of The University of Michigan +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer; +# redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution; +# neither the name of the copyright holders nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Authors: Steve Reinhardt + +root.system.cpu.workload = LiveProcess(file = binpath('hello')) diff --git a/tests/quick/eio1/ref/alpha/eio/detailed/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini index a442ec572..a442ec572 100644 --- a/tests/quick/eio1/ref/alpha/eio/detailed/config.ini +++ b/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini diff --git a/tests/quick/eio1/ref/alpha/eio/detailed/config.out b/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out index c92557696..c92557696 100644 --- a/tests/quick/eio1/ref/alpha/eio/detailed/config.out +++ b/tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out diff --git a/tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt b/tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt index 119cc8e9d..119cc8e9d 100644 --- a/tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt +++ b/tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt diff --git a/tests/quick/eio1/ref/alpha/eio/detailed/stderr b/tests/quick/20.eio-short/ref/alpha/eio/detailed/stderr index 7ded22db8..7ded22db8 100644 --- a/tests/quick/eio1/ref/alpha/eio/detailed/stderr +++ b/tests/quick/20.eio-short/ref/alpha/eio/detailed/stderr diff --git a/tests/quick/eio1/ref/alpha/eio/detailed/stdout b/tests/quick/20.eio-short/ref/alpha/eio/detailed/stdout index ee0eb672e..ee0eb672e 100644 --- a/tests/quick/eio1/ref/alpha/eio/detailed/stdout +++ b/tests/quick/20.eio-short/ref/alpha/eio/detailed/stdout diff --git a/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini index 4cbe1fce6..4cbe1fce6 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini diff --git a/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out index 65a9f6f7f..65a9f6f7f 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out diff --git a/tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt index 29c0b91ac..29c0b91ac 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt diff --git a/tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr index 4e444fa6b..4e444fa6b 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr diff --git a/tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout index 80b37e259..80b37e259 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout diff --git a/tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini index c4c381b93..c4c381b93 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini diff --git a/tests/quick/eio1/ref/alpha/eio/simple-timing/config.out b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out index 882db9c06..882db9c06 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-timing/config.out +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out diff --git a/tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt index 5f7766bac..5f7766bac 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt diff --git a/tests/quick/eio1/ref/alpha/eio/simple-timing/stderr b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr index 4e444fa6b..4e444fa6b 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-timing/stderr +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr diff --git a/tests/quick/eio1/ref/alpha/eio/simple-timing/stdout b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout index c14f4a3c9..c14f4a3c9 100644 --- a/tests/quick/eio1/ref/alpha/eio/simple-timing/stdout +++ b/tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout diff --git a/tests/quick/20.eio-short/test.py b/tests/quick/20.eio-short/test.py new file mode 100644 index 000000000..67e83d66e --- /dev/null +++ b/tests/quick/20.eio-short/test.py @@ -0,0 +1,30 @@ +# Copyright (c) 2006 The Regents of The University of Michigan +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer; +# redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution; +# neither the name of the copyright holders nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Authors: Steve Reinhardt + +root.system.cpu.workload = EioProcess(file = binpath('anagram-vshort.eio.gz')) +root.system.cpu.max_insts_any_thread = 500000 diff --git a/tests/quick/eio1/test.py b/tests/quick/eio1/test.py deleted file mode 100644 index 40e1a4527..000000000 --- a/tests/quick/eio1/test.py +++ /dev/null @@ -1,2 +0,0 @@ -root.system.cpu.workload = EioProcess(file = tests_root + '/test-progs/anagram/bin/anagram-vshort.eio.gz') -root.system.cpu.max_insts_any_thread = 500000 diff --git a/tests/run.py b/tests/run.py index 0042b2b46..ae9d46258 100644 --- a/tests/run.py +++ b/tests/run.py @@ -33,12 +33,21 @@ import os, sys # find path to directory containing this file tests_root = os.path.dirname(__file__) +test_progs = os.path.join(tests_root, 'test-progs') + +# generate path to binary file +def binpath(app, file=None): + # executable has same name as app unless specified otherwise + if not file: + file = app + return os.path.join(test_progs, app, 'bin', isa, opsys, file) # build configuration execfile(os.path.join(tests_root, config + '.py')) # set default maxtick... script can override -maxtick = 1000000 +# -1 means run forever +maxtick = -1 # tweak configuration for specific test diff --git a/tests/simple-atomic.py b/tests/simple-atomic.py index 78e87dc25..e3eb62ef0 100644 --- a/tests/simple-atomic.py +++ b/tests/simple-atomic.py @@ -7,8 +7,6 @@ system = System(cpu = AtomicSimpleCPU(), physmem = PhysicalMemory(), membus = Bus()) system.physmem.port = system.membus.port -system.cpu.icache_port = system.membus.port -system.cpu.dcache_port = system.membus.port +system.cpu.connectMemPorts(system.membus) root = Root(system = system) - diff --git a/tests/simple-timing.py b/tests/simple-timing.py index 128cace3c..b3d11e069 100644 --- a/tests/simple-timing.py +++ b/tests/simple-timing.py @@ -11,11 +11,13 @@ class MyCache(BaseCache): tgts_per_mshr = 5 cpu = TimingSimpleCPU() -cpu.icache = MyCache(size = '128kB') -cpu.dcache = MyCache(size = '256kB') -cpu.l2cache = MyCache(size = '2MB') +cpu.addTwoLevelCacheHierarchy(MyCache(size = '128kB'), MyCache(size = '256kB'), + MyCache(size = '2MB')) -cpu.icache_port = cpu.icache.cpu_side -cpu.dcache_port = cpu.dcache.cpu_side +system = System(cpu = cpu, + physmem = PhysicalMemory(), + membus = Bus()) +system.physmem.port = system.membus.port +cpu.connectMemPorts(system.membus) -root = makeSESystem(cpu) +root = Root(system = system) diff --git a/tests/test-progs/hello/bin/alpha/linux/hello b/tests/test-progs/hello/bin/alpha/linux/hello Binary files differnew file mode 100755 index 000000000..59c0d195c --- /dev/null +++ b/tests/test-progs/hello/bin/alpha/linux/hello diff --git a/tests/test-progs/hello/bin/mips/linux/hello_mips b/tests/test-progs/hello/bin/mips/linux/hello_mips Binary files differnew file mode 100755 index 000000000..a3db001ec --- /dev/null +++ b/tests/test-progs/hello/bin/mips/linux/hello_mips diff --git a/tests/test-progs/hello/bin/sparc/bin b/tests/test-progs/hello/bin/sparc/bin Binary files differnew file mode 100755 index 000000000..e254ae33f --- /dev/null +++ b/tests/test-progs/hello/bin/sparc/bin |