summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 09:45:46 -0400
committerSteve Reinhardt <stever@eecs.umich.edu>2006-08-16 09:45:46 -0400
commitbb9d2c345791331916df482f23173e6b5f5bf804 (patch)
tree5a5135ca4f233b6ede3f411783ff4844986d38a3
parentda6649fa714453bb4b79dc19f2a3a7b2cea6d517 (diff)
downloadgem5-bb9d2c345791331916df482f23173e6b5f5bf804.tar.xz
Halfway through setting up new test structure... committing so
O can move to my laptop. tests/SConscript: Start to simplify. --HG-- rename : tests/test1/ref/alpha/detailed/config.ini => tests/quick/eio1/ref/alpha/eio/detailed/config.ini rename : tests/test1/ref/alpha/detailed/config.out => tests/quick/eio1/ref/alpha/eio/detailed/config.out rename : tests/test1/ref/alpha/detailed/m5stats.txt => tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt rename : tests/test1/ref/alpha/detailed/stderr => tests/quick/eio1/ref/alpha/eio/detailed/stderr rename : tests/test1/ref/alpha/detailed/stdout => tests/quick/eio1/ref/alpha/eio/detailed/stdout rename : tests/test1/ref/alpha/atomic/config.ini => tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini rename : tests/test1/ref/alpha/atomic/config.out => tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out rename : tests/test1/ref/alpha/atomic/m5stats.txt => tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt rename : tests/test1/ref/alpha/atomic/stderr => tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr rename : tests/test1/ref/alpha/atomic/stdout => tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout rename : tests/test1/ref/alpha/timing/config.ini => tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini rename : tests/test1/ref/alpha/timing/config.out => tests/quick/eio1/ref/alpha/eio/simple-timing/config.out rename : tests/test1/ref/alpha/timing/m5stats.txt => tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt rename : tests/test1/ref/alpha/timing/stderr => tests/quick/eio1/ref/alpha/eio/simple-timing/stderr rename : tests/test1/ref/alpha/timing/stdout => tests/quick/eio1/ref/alpha/eio/simple-timing/stdout extra : convert_revision : 924d2ee29d2a2709135ff8e5c5822fe47a8a60f6
-rw-r--r--tests/SConscript173
-rw-r--r--tests/quick/eio1/ref/alpha/eio/detailed/config.ini (renamed from tests/test1/ref/alpha/detailed/config.ini)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/detailed/config.out (renamed from tests/test1/ref/alpha/detailed/config.out)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt (renamed from tests/test1/ref/alpha/detailed/m5stats.txt)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/detailed/stderr (renamed from tests/test1/ref/alpha/detailed/stderr)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/detailed/stdout (renamed from tests/test1/ref/alpha/detailed/stdout)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini (renamed from tests/test1/ref/alpha/atomic/config.ini)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out (renamed from tests/test1/ref/alpha/atomic/config.out)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt (renamed from tests/test1/ref/alpha/atomic/m5stats.txt)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr (renamed from tests/test1/ref/alpha/atomic/stderr)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout (renamed from tests/test1/ref/alpha/atomic/stdout)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini (renamed from tests/test1/ref/alpha/timing/config.ini)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-timing/config.out (renamed from tests/test1/ref/alpha/timing/config.out)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt (renamed from tests/test1/ref/alpha/timing/m5stats.txt)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-timing/stderr (renamed from tests/test1/ref/alpha/timing/stderr)0
-rw-r--r--tests/quick/eio1/ref/alpha/eio/simple-timing/stdout (renamed from tests/test1/ref/alpha/timing/stdout)0
-rw-r--r--tests/quick/eio1/test.py2
-rw-r--r--tests/run.py53
-rw-r--r--tests/simple-atomic.py14
-rw-r--r--tests/simple-timing.py21
20 files changed, 144 insertions, 119 deletions
diff --git a/tests/SConscript b/tests/SConscript
index 7ccb77759..80131057d 100644
--- a/tests/SConscript
+++ b/tests/SConscript
@@ -139,130 +139,65 @@ def update_test_string(target, source, env):
updateAction = env.Action(update_test, update_test_string)
-def test_builder(env, category, cpu_list=[], os_list=[], refdir='ref',
- timeout=15):
- """Define a test.
-
- Args:
- category -- string describing test category (e.g., 'quick')
- cpu_list -- list of CPUs to runs this test on (blank means all compiled CPUs)
- os_list -- list of OSs to run this test on
- refdir -- subdirectory containing reference output (default 'ref')
- timeout -- test timeout in minutes (only enforced on pool)
-
- """
-
- default_refdir = False
- if refdir == 'ref':
- default_refdir = True
- valid_cpu_list = []
- if len(cpu_list) == 0:
- valid_cpu_list = env['CPU_MODELS']
+def test_builder(env, ref_dir):
+ """Define a test."""
+
+ (category, name, _ref, isa, opsys, config) = ref_dir.split('/')
+ assert(_ref == 'ref')
+
+ # target path (where test output goes) is the same except without
+ # the 'ref' component
+ tgt_dir = os.path.join(category, name, isa, opsys, config)
+
+ # prepend file name with tgt_dir
+ def tgt(f):
+ return os.path.join(tgt_dir, f)
+
+ ref_stats = os.path.join(ref_dir, 'm5stats.txt')
+ new_stats = tgt('m5stats.txt')
+ status_file = tgt('status')
+
+ # Base command for running test. We mess around with indirectly
+ # referring to files via SOURCES and TARGETS so that scons can
+ # mess with paths all it wants to and we still get the right
+ # files.
+ base_cmd = '${SOURCES[0]} -d $TARGET.dir ${SOURCES[1]} %s' % tgt_dir
+ # stdout and stderr files
+ cmd_stdout = '${TARGETS[0]}'
+ cmd_stderr = '${TARGETS[1]}'
+
+ # Prefix test run with batch job submission command if appropriate.
+ # Output redirection is also different for batch runs.
+ # Batch command also supports timeout arg (in seconds, not minutes).
+ if env['BATCH']:
+ cmd = [env['BATCH_CMD'], '-t', str(timeout * 60),
+ '-o', cmd_stdout, '-e', cmd_stderr, base_cmd]
else:
- for i in cpu_list:
- if i in env['CPU_MODELS']:
- valid_cpu_list.append(i)
- cpu_list = valid_cpu_list
- if env['TEST_CPU_MODELS']:
- valid_cpu_list = []
- for i in env['TEST_CPU_MODELS']:
- if i in cpu_list:
- valid_cpu_list.append(i)
- cpu_list = valid_cpu_list
-# Code commented out that shows the general structure if we want to test
-# different OS's as well.
-# if len(os_list) == 0:
-# for test_cpu in cpu_list:
-# build_cpu_test(env, category, '', test_cpu, refdir, timeout)
-# else:
-# for test_os in os_list:
-# for test_cpu in cpu_list:
-# build_cpu_test(env, category, test_os, test_cpu, refdir,
-# timeout)
- # Loop through CPU models and generate proper options, ref directories
- for cpu in cpu_list:
- test_os = ''
- if cpu == "AtomicSimpleCPU":
- cpu_option = ('','atomic/')
- elif cpu == "TimingSimpleCPU":
- cpu_option = ('--timing','timing/')
- elif cpu == "O3CPU":
- cpu_option = ('--detailed','detailed/')
- else:
- raise TypeError, "Unknown CPU model specified"
-
- if default_refdir:
- # Reference stats located in ref/arch/os/cpu or ref/arch/cpu
- # if no OS specified
- test_refdir = os.path.join(refdir, env['TARGET_ISA'])
- if test_os != '':
- test_refdir = os.path.join(test_refdir, test_os)
- cpu_refdir = os.path.join(test_refdir, cpu_option[1])
-
- ref_stats = os.path.join(cpu_refdir, 'm5stats.txt')
-
- # base command for running test
- base_cmd = '${SOURCES[0]} -d $TARGET.dir ${SOURCES[1]}'
- base_cmd = base_cmd + ' ' + cpu_option[0]
- # stdout and stderr files
- cmd_stdout = '${TARGETS[0]}'
- cmd_stderr = '${TARGETS[1]}'
-
- stdout_string = cpu_option[1] + 'stdout'
- stderr_string = cpu_option[1] + 'stderr'
- m5stats_string = cpu_option[1] + 'm5stats.txt'
- outdiff_string = cpu_option[1] + 'outdiff'
- statsdiff_string = cpu_option[1] + 'statsdiff'
- status_string = cpu_option[1] + 'status'
-
- # Prefix test run with batch job submission command if appropriate.
- # Output redirection is also different for batch runs.
- # Batch command also supports timeout arg (in seconds, not minutes).
- if env['BATCH']:
- cmd = [env['BATCH_CMD'], '-t', str(timeout * 60),
- '-o', cmd_stdout, '-e', cmd_stderr, base_cmd]
- else:
- cmd = [base_cmd, '>', cmd_stdout, '2>', cmd_stderr]
+ cmd = [base_cmd, '>', cmd_stdout, '2>', cmd_stderr]
- env.Command([stdout_string, stderr_string, m5stats_string],
- [env.M5Binary, 'run.py'], ' '.join(cmd))
-
- # order of targets is important... see check_test
- env.Command([outdiff_string, statsdiff_string, status_string],
- [ref_stats, m5stats_string],
- testAction)
-
- # phony target to echo status
- if env['update_ref']:
- p = env.Command(cpu_option[1] + '_update',
- [ref_stats, m5stats_string, status_string],
- updateAction)
- else:
- p = env.Command(cpu_option[1] + '_print', [status_string],
- printAction)
- env.AlwaysBuild(p)
+ env.Command([tgt('stdout'), tgt('stderr'), new_stats],
+ [env.M5Binary, 'run.py'], ' '.join(cmd))
+
+ # order of targets is important... see check_test
+ env.Command([tgt('outdiff'), tgt('statsdiff'), status_file],
+ [ref_stats, new_stats],
+ testAction)
+
+ # phony target to echo status
+ if env['update_ref']:
+ p = env.Command(tgt('_update'),
+ [ref_stats, new_stats, status_file],
+ updateAction)
+ else:
+ p = env.Command(tgt('_print'), [status_file], printAction)
- env.Tests.setdefault(category, [])
- env.Tests[category] += p
+ env.AlwaysBuild(p)
-# Make test_builder a "wrapper" function. See SCons wiki page at
-# http://www.scons.org/cgi-bin/wiki/WrapperFunctions.
-SConsEnvironment.Test = test_builder
cwd = os.getcwd()
os.chdir(str(Dir('.').srcdir))
-scripts = glob.glob('*/SConscript')
+for config in ['simple-atomic']:
+ dirs = glob.glob('*/*/ref/%s/*/%s' % (env['TARGET_ISA'], config))
+ for d in dirs:
+ test_builder(env, d)
os.chdir(cwd)
-
-for s in scripts:
- SConscript(s, exports = 'env', duplicate = False)
-
-# Set up phony commands for various test categories
-allTests = []
-for (key, val) in env.Tests.iteritems():
- env.Command(key, val, env.NoAction)
- allTests += val
-
-# The 'all' target is redundant since just specifying the test
-# directory name (e.g., ALPHA_SE/test/opt) has the same effect.
-env.Command('all', allTests, env.NoAction)
diff --git a/tests/test1/ref/alpha/detailed/config.ini b/tests/quick/eio1/ref/alpha/eio/detailed/config.ini
index a442ec572..a442ec572 100644
--- a/tests/test1/ref/alpha/detailed/config.ini
+++ b/tests/quick/eio1/ref/alpha/eio/detailed/config.ini
diff --git a/tests/test1/ref/alpha/detailed/config.out b/tests/quick/eio1/ref/alpha/eio/detailed/config.out
index c92557696..c92557696 100644
--- a/tests/test1/ref/alpha/detailed/config.out
+++ b/tests/quick/eio1/ref/alpha/eio/detailed/config.out
diff --git a/tests/test1/ref/alpha/detailed/m5stats.txt b/tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt
index 119cc8e9d..119cc8e9d 100644
--- a/tests/test1/ref/alpha/detailed/m5stats.txt
+++ b/tests/quick/eio1/ref/alpha/eio/detailed/m5stats.txt
diff --git a/tests/test1/ref/alpha/detailed/stderr b/tests/quick/eio1/ref/alpha/eio/detailed/stderr
index 7ded22db8..7ded22db8 100644
--- a/tests/test1/ref/alpha/detailed/stderr
+++ b/tests/quick/eio1/ref/alpha/eio/detailed/stderr
diff --git a/tests/test1/ref/alpha/detailed/stdout b/tests/quick/eio1/ref/alpha/eio/detailed/stdout
index ee0eb672e..ee0eb672e 100644
--- a/tests/test1/ref/alpha/detailed/stdout
+++ b/tests/quick/eio1/ref/alpha/eio/detailed/stdout
diff --git a/tests/test1/ref/alpha/atomic/config.ini b/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini
index 4cbe1fce6..4cbe1fce6 100644
--- a/tests/test1/ref/alpha/atomic/config.ini
+++ b/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.ini
diff --git a/tests/test1/ref/alpha/atomic/config.out b/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out
index 65a9f6f7f..65a9f6f7f 100644
--- a/tests/test1/ref/alpha/atomic/config.out
+++ b/tests/quick/eio1/ref/alpha/eio/simple-atomic/config.out
diff --git a/tests/test1/ref/alpha/atomic/m5stats.txt b/tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt
index 29c0b91ac..29c0b91ac 100644
--- a/tests/test1/ref/alpha/atomic/m5stats.txt
+++ b/tests/quick/eio1/ref/alpha/eio/simple-atomic/m5stats.txt
diff --git a/tests/test1/ref/alpha/atomic/stderr b/tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr
index 4e444fa6b..4e444fa6b 100644
--- a/tests/test1/ref/alpha/atomic/stderr
+++ b/tests/quick/eio1/ref/alpha/eio/simple-atomic/stderr
diff --git a/tests/test1/ref/alpha/atomic/stdout b/tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout
index 80b37e259..80b37e259 100644
--- a/tests/test1/ref/alpha/atomic/stdout
+++ b/tests/quick/eio1/ref/alpha/eio/simple-atomic/stdout
diff --git a/tests/test1/ref/alpha/timing/config.ini b/tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini
index c4c381b93..c4c381b93 100644
--- a/tests/test1/ref/alpha/timing/config.ini
+++ b/tests/quick/eio1/ref/alpha/eio/simple-timing/config.ini
diff --git a/tests/test1/ref/alpha/timing/config.out b/tests/quick/eio1/ref/alpha/eio/simple-timing/config.out
index 882db9c06..882db9c06 100644
--- a/tests/test1/ref/alpha/timing/config.out
+++ b/tests/quick/eio1/ref/alpha/eio/simple-timing/config.out
diff --git a/tests/test1/ref/alpha/timing/m5stats.txt b/tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt
index 5f7766bac..5f7766bac 100644
--- a/tests/test1/ref/alpha/timing/m5stats.txt
+++ b/tests/quick/eio1/ref/alpha/eio/simple-timing/m5stats.txt
diff --git a/tests/test1/ref/alpha/timing/stderr b/tests/quick/eio1/ref/alpha/eio/simple-timing/stderr
index 4e444fa6b..4e444fa6b 100644
--- a/tests/test1/ref/alpha/timing/stderr
+++ b/tests/quick/eio1/ref/alpha/eio/simple-timing/stderr
diff --git a/tests/test1/ref/alpha/timing/stdout b/tests/quick/eio1/ref/alpha/eio/simple-timing/stdout
index c14f4a3c9..c14f4a3c9 100644
--- a/tests/test1/ref/alpha/timing/stdout
+++ b/tests/quick/eio1/ref/alpha/eio/simple-timing/stdout
diff --git a/tests/quick/eio1/test.py b/tests/quick/eio1/test.py
new file mode 100644
index 000000000..40e1a4527
--- /dev/null
+++ b/tests/quick/eio1/test.py
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000..0042b2b46
--- /dev/null
+++ b/tests/run.py
@@ -0,0 +1,53 @@
+# 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
+
+import os, sys
+
+# single "path" arg encodes everything we need to know about test
+(category, name, isa, opsys, config) = sys.argv[1].split('/')
+
+# find path to directory containing this file
+tests_root = os.path.dirname(__file__)
+
+# build configuration
+execfile(os.path.join(tests_root, config + '.py'))
+
+# set default maxtick... script can override
+maxtick = 1000000
+
+# tweak configuration for specific test
+
+execfile(os.path.join(tests_root, category, name, 'test.py'))
+
+# instantiate configuration
+m5.instantiate(root)
+
+# simulate until program terminates
+exit_event = m5.simulate(maxtick)
+
+print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
diff --git a/tests/simple-atomic.py b/tests/simple-atomic.py
new file mode 100644
index 000000000..78e87dc25
--- /dev/null
+++ b/tests/simple-atomic.py
@@ -0,0 +1,14 @@
+import m5
+from m5.objects import *
+m5.AddToPath('../configs/common')
+from SEConfig import *
+
+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
+
+root = Root(system = system)
+
diff --git a/tests/simple-timing.py b/tests/simple-timing.py
new file mode 100644
index 000000000..128cace3c
--- /dev/null
+++ b/tests/simple-timing.py
@@ -0,0 +1,21 @@
+import m5
+from m5.objects import *
+m5.AddToPath('../configs/common')
+from SEConfig import *
+
+class MyCache(BaseCache):
+ assoc = 2
+ block_size = 64
+ latency = 1
+ mshrs = 10
+ tgts_per_mshr = 5
+
+cpu = TimingSimpleCPU()
+cpu.icache = MyCache(size = '128kB')
+cpu.dcache = MyCache(size = '256kB')
+cpu.l2cache = MyCache(size = '2MB')
+
+cpu.icache_port = cpu.icache.cpu_side
+cpu.dcache_port = cpu.dcache.cpu_side
+
+root = makeSESystem(cpu)