summaryrefslogtreecommitdiff
path: root/tests/quick
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 /tests/quick
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 'tests/quick')
-rw-r--r--tests/quick/00.hello/ref/alpha/linux/simple-atomic/m5stats.txt0
-rw-r--r--tests/quick/00.hello/ref/alpha/linux/simple-atomic/stderr0
-rw-r--r--tests/quick/00.hello/ref/alpha/linux/simple-atomic/stdout0
-rw-r--r--tests/quick/00.hello/ref/mips/linux/simple-atomic/m5stats.txt0
-rw-r--r--tests/quick/00.hello/ref/mips/linux/simple-atomic/stderr0
-rw-r--r--tests/quick/00.hello/ref/mips/linux/simple-atomic/stdout0
-rw-r--r--tests/quick/00.hello/ref/sparc/linux/simple-atomic/m5stats.txt0
-rw-r--r--tests/quick/00.hello/ref/sparc/linux/simple-atomic/stderr0
-rw-r--r--tests/quick/00.hello/ref/sparc/linux/simple-atomic/stdout0
-rw-r--r--tests/quick/00.hello/test.py29
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/detailed/config.ini (renamed from tests/quick/eio1/ref/alpha/eio/detailed/config.ini)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/detailed/config.out (renamed from tests/quick/eio1/ref/alpha/eio/detailed/config.out)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/detailed/m5stats.txt (renamed from tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/detailed/stderr (renamed from tests/quick/eio1/ref/alpha/eio/detailed/stderr)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/detailed/stdout (renamed from tests/quick/eio1/ref/alpha/eio/detailed/stdout)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.ini (renamed from tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/config.out (renamed from tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/m5stats.txt (renamed from tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stderr (renamed from tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-atomic/stdout (renamed from tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.ini (renamed from tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-timing/config.out (renamed from tests/quick/eio1/ref/alpha/eio/simple-timing/config.out)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-timing/m5stats.txt (renamed from tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stderr (renamed from tests/quick/eio1/ref/alpha/eio/simple-timing/stderr)0
-rw-r--r--tests/quick/20.eio-short/ref/alpha/eio/simple-timing/stdout (renamed from tests/quick/eio1/ref/alpha/eio/simple-timing/stdout)0
-rw-r--r--tests/quick/20.eio-short/test.py30
-rw-r--r--tests/quick/eio1/test.py2
27 files changed, 59 insertions, 2 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