changeset 5bd33f7c26ea in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=5bd33f7c26ea
description:
m5: Regression Tester Update
This patch includes the necessary regression updates to test the new
ruby
configuration system. The patch includes support for multiple ruby
protocols
and adds the ruby random tester. The patch removes atomic mode test for
ruby since ruby does not support atomic mode acceses. These tests can
be
added back in when ruby supports atomic mode for real.
diffstat:
158 files changed, 31288 insertions(+), 8982 deletions(-)
build_opts/ALPHA_SE_MESI_CMP_directory
| 4
build_opts/ALPHA_SE_MOESI_CMP_directory
| 4
build_opts/ALPHA_SE_MOESI_CMP_token
| 4
build_opts/ALPHA_SE_MOESI_hammer
| 4
src/mem/protocol/MESI_CMP_directory.slicc
| 1
tests/SConscript
| 18
tests/configs/memtest-ruby.py
| 10
tests/configs/ruby_config.py
| 30
tests/configs/rubytest-ruby.py
| 103
tests/configs/simple-atomic-ruby.py
| 42
tests/configs/simple-timing-mp-ruby.py
| 56
tests/configs/simple-timing-ruby.py
| 61
tests/quick/00.hello/ref/alpha/linux/simple-atomic-ruby/config.ini
| 97
tests/quick/00.hello/ref/alpha/linux/simple-atomic-ruby/ruby.stats
| 382
tests/quick/00.hello/ref/alpha/linux/simple-atomic-ruby/simerr
| 23
tests/quick/00.hello/ref/alpha/linux/simple-atomic-ruby/simout
| 18
tests/quick/00.hello/ref/alpha/linux/simple-atomic-ruby/stats.txt
| 50
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/config.ini
| 281
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 617 +
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simerr
| 3
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/simout
| 17
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MESI_CMP_directory/stats.txt
| 50
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 277
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
| 1375 +++
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simerr
| 3
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/simout
| 17
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 50
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/config.ini
| 287
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 912 ++
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simerr
| 3
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/simout
| 17
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 50
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/config.ini
| 249
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/ruby.stats
| 576 +
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simerr
| 3
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/simout
| 17
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby-MOESI_hammer/stats.txt
| 50
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby/config.ini
| 191
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby/ruby.stats
| 393
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby/simerr
| 20
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby/simout
| 13
tests/quick/00.hello/ref/alpha/linux/simple-timing-ruby/stats.txt
| 16
tests/quick/00.hello/ref/alpha/tru64/simple-atomic-ruby/config.ini
| 97
tests/quick/00.hello/ref/alpha/tru64/simple-atomic-ruby/ruby.stats
| 382
tests/quick/00.hello/ref/alpha/tru64/simple-atomic-ruby/simerr
| 25
tests/quick/00.hello/ref/alpha/tru64/simple-atomic-ruby/simout
| 18
tests/quick/00.hello/ref/alpha/tru64/simple-atomic-ruby/stats.txt
| 50
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/config.ini
| 281
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/ruby.stats
| 617 +
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simerr
| 5
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/simout
| 17
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MESI_CMP_directory/stats.txt
| 50
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/config.ini
| 277
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/ruby.stats
| 1375 +++
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simerr
| 5
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/simout
| 17
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_directory/stats.txt
| 50
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/config.ini
| 287
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/ruby.stats
| 912 ++
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simerr
| 5
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/simout
| 17
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_CMP_token/stats.txt
| 50
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/config.ini
| 249
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/ruby.stats
| 576 +
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simerr
| 5
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/simout
| 17
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby-MOESI_hammer/stats.txt
| 50
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby/config.ini
| 191
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby/ruby.stats
| 403
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby/simerr
| 22
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby/simout
| 13
tests/quick/00.hello/ref/alpha/tru64/simple-timing-ruby/stats.txt
| 16
tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/config.ini
| 153
tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simerr
| 5
tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/simout
| 17
tests/quick/00.hello/ref/mips/linux/simple-atomic-ruby/stats.txt
| 36
tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/config.ini
| 194
tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simerr
| 2
tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/simout
| 14
tests/quick/00.hello/ref/mips/linux/simple-timing-ruby/stats.txt
| 16
tests/quick/00.hello/ref/sparc/linux/simple-atomic-ruby/config.ini
| 97
tests/quick/00.hello/ref/sparc/linux/simple-atomic-ruby/ruby.stats
| 382
tests/quick/00.hello/ref/sparc/linux/simple-atomic-ruby/simerr
| 23
tests/quick/00.hello/ref/sparc/linux/simple-atomic-ruby/simout
| 16
tests/quick/00.hello/ref/sparc/linux/simple-atomic-ruby/stats.txt
| 18
tests/quick/00.hello/ref/sparc/linux/simple-timing-ruby/config.ini
| 190
tests/quick/00.hello/ref/sparc/linux/simple-timing-ruby/ruby.stats
| 389
tests/quick/00.hello/ref/sparc/linux/simple-timing-ruby/simerr
| 20
tests/quick/00.hello/ref/sparc/linux/simple-timing-ruby/simout
| 13
tests/quick/00.hello/ref/sparc/linux/simple-timing-ruby/stats.txt
| 16
tests/quick/00.hello/ref/x86/linux/simple-atomic-ruby/config.ini
| 97
tests/quick/00.hello/ref/x86/linux/simple-atomic-ruby/ruby.stats
| 344
tests/quick/00.hello/ref/x86/linux/simple-atomic-ruby/simerr
| 11
tests/quick/00.hello/ref/x86/linux/simple-atomic-ruby/simout
| 16
tests/quick/00.hello/ref/x86/linux/simple-atomic-ruby/stats.txt
| 18
tests/quick/00.hello/ref/x86/linux/simple-timing-ruby/config.ini
| 190
tests/quick/00.hello/ref/x86/linux/simple-timing-ruby/ruby.stats
| 358
tests/quick/00.hello/ref/x86/linux/simple-timing-ruby/simerr
| 4
tests/quick/00.hello/ref/x86/linux/simple-timing-ruby/simout
| 14
tests/quick/00.hello/ref/x86/linux/simple-timing-ruby/stats.txt
| 16
tests/quick/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp-ruby/config.ini
| 218
tests/quick/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp-ruby/ruby.stats
| 930 --
tests/quick/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp-ruby/simerr
| 41
tests/quick/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp-ruby/simout
| 88
tests/quick/40.m5threads-test-atomic/ref/sparc/linux/simple-atomic-mp-ruby/stats.txt
| 33
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/config.ini
| 775 +
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/ruby.stats
| 1601 +++
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simerr
| 74
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/simout
| 15
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MESI_CMP_directory/stats.txt
| 34
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/config.ini
| 757 +
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/ruby.stats
| 2786 ++++++
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simerr
| 74
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/simout
| 15
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_directory/stats.txt
| 34
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/config.ini
| 802 +
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/ruby.stats
| 3439 +++++++
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simerr
| 74
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/simout
| 15
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_CMP_token/stats.txt
| 34
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/config.ini
| 785 +
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/ruby.stats
| 2188 ++++
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simerr
| 74
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/simout
| 15
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby-MOESI_hammer/stats.txt
| 34
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby/config.ini
| 585 +
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby/ruby.stats
| 4407 +---------
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby/simerr
| 146
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby/simout
| 12
tests/quick/50.memtest/ref/alpha/linux/memtest-ruby/stats.txt
| 42
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/config.ini
| 225
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/ruby.stats
| 616 +
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simerr
| 1
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/simout
| 15
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MESI_CMP_directory/stats.txt
| 10
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/config.ini
| 221
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/ruby.stats
| 1374 +++
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simerr
| 1
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/simout
| 15
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_directory/stats.txt
| 10
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/config.ini
| 231
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/ruby.stats
| 921 ++
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simerr
| 1
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/simout
| 15
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_CMP_token/stats.txt
| 10
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/config.ini
| 193
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/ruby.stats
| 572 +
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simerr
| 1
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/simout
| 15
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby-MOESI_hammer/stats.txt
| 10
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/config.ini
| 177
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/ruby.stats
| 298
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/simerr
| 1
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/simout
| 15
tests/quick/60.rubytest/ref/alpha/linux/rubytest-ruby/stats.txt
| 10
tests/quick/60.rubytest/test.py
| 29
tests/run.py
| 8
util/regress
| 6
diffs (truncated from 42109 to 300 lines):
diff -r a162a2b0b1f8 -r 5bd33f7c26ea build_opts/ALPHA_SE_MESI_CMP_directory
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build_opts/ALPHA_SE_MESI_CMP_directory Fri Jan 29 20:29:40 2010 -0800
@@ -0,0 +1,4 @@
+FULL_SYSTEM = 0
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MESI_CMP_directory'
diff -r a162a2b0b1f8 -r 5bd33f7c26ea build_opts/ALPHA_SE_MOESI_CMP_directory
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build_opts/ALPHA_SE_MOESI_CMP_directory Fri Jan 29 20:29:40 2010 -0800
@@ -0,0 +1,4 @@
+FULL_SYSTEM = 0
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MOESI_CMP_directory'
diff -r a162a2b0b1f8 -r 5bd33f7c26ea build_opts/ALPHA_SE_MOESI_CMP_token
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build_opts/ALPHA_SE_MOESI_CMP_token Fri Jan 29 20:29:40 2010 -0800
@@ -0,0 +1,4 @@
+FULL_SYSTEM = 0
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MOESI_CMP_token'
diff -r a162a2b0b1f8 -r 5bd33f7c26ea build_opts/ALPHA_SE_MOESI_hammer
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/build_opts/ALPHA_SE_MOESI_hammer Fri Jan 29 20:29:40 2010 -0800
@@ -0,0 +1,4 @@
+FULL_SYSTEM = 0
+SS_COMPATIBLE_FP = 1
+CPU_MODELS = 'AtomicSimpleCPU,TimingSimpleCPU,O3CPU,InOrderCPU'
+PROTOCOL = 'MOESI_hammer'
diff -r a162a2b0b1f8 -r 5bd33f7c26ea src/mem/protocol/MESI_CMP_directory.slicc
--- a/src/mem/protocol/MESI_CMP_directory.slicc Fri Jan 29 20:29:34 2010 -0800
+++ b/src/mem/protocol/MESI_CMP_directory.slicc Fri Jan 29 20:29:40 2010 -0800
@@ -4,4 +4,3 @@
MESI_CMP_directory-dir.sm
MESI_CMP_directory-dma.sm
standard_CMP-protocol.sm
-
diff -r a162a2b0b1f8 -r 5bd33f7c26ea tests/SConscript
--- a/tests/SConscript Fri Jan 29 20:29:34 2010 -0800
+++ b/tests/SConscript Fri Jan 29 20:29:40 2010 -0800
@@ -264,11 +264,23 @@
else:
configs += ['simple-atomic', 'simple-timing', 'o3-timing', 'memtest',
'simple-atomic-mp', 'simple-timing-mp', 'o3-timing-mp',
- 'inorder-timing']
+ 'inorder-timing', 'rubytest']
if env['RUBY']:
- # Hack for Ruby
- configs += [c + '-ruby' for c in configs]
+ # With Ruby, A protocol must be specified in the environment
+ assert(env['PROTOCOL'])
+
+ #
+ # Is there a way to determine what is Protocol EnumVariable
+ # default and eliminate the need to hard code the default protocol below?
+ #
+ # If the binary includes the default ruby protocol, run both ruby and
+ # non-ruby versions of the tests. Otherwise just run the ruby versions.
+ #
+ if env['PROTOCOL'] == 'MI_example':
+ configs += [c + "-ruby" for c in configs]
+ else:
+ configs = [c + "-ruby-" + env['PROTOCOL'] for c in configs]
cwd = os.getcwd()
os.chdir(str(Dir('.').srcdir))
diff -r a162a2b0b1f8 -r 5bd33f7c26ea tests/configs/memtest-ruby.py
--- a/tests/configs/memtest-ruby.py Fri Jan 29 20:29:34 2010 -0800
+++ b/tests/configs/memtest-ruby.py Fri Jan 29 20:29:40 2010 -0800
@@ -1,4 +1,5 @@
# Copyright (c) 2006-2007 The Regents of The University of Michigan
+# Copyright (c) 2010 Advanced Micro Devices, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -63,7 +64,11 @@
#MAX CORES IS 8 with the fals sharing method
nb_cores = 8
-cpus = [ MemTest() for i in xrange(nb_cores) ]
+
+# ruby does not support atomic, functional, or uncacheable accesses
+cpus = [ MemTest(atomic=False, percent_functional=0, \
+ percent_uncacheable=0) \
+ for i in xrange(nb_cores) ]
# overwrite options.num_cpus with the nb_cores value
options.num_cpus = nb_cores
@@ -91,3 +96,6 @@
root = Root(system = system)
root.system.mem_mode = 'timing'
+
+# Not much point in this being higher than the L1 latency
+m5.ticks.setGlobalFrequency('1ns')
diff -r a162a2b0b1f8 -r 5bd33f7c26ea tests/configs/ruby_config.py
--- a/tests/configs/ruby_config.py Fri Jan 29 20:29:34 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-import os
-import subprocess
-
-from os.path import dirname, join as joinpath
-
-import m5
-from m5.params import *
-
-def generate(config_file, cores=1, memories=1, memory_size=1024, \
- cache_size=32768, cache_assoc=8, dmas=1,
- ruby_tick='1t', ports_per_cpu=2, protocol='MOESI_CMP_directory'):
- default = joinpath(dirname(__file__), '../../src/mem/ruby/config')
- ruby_config = os.environ.get('RUBY_CONFIG', default)
- args = [ "ruby", "-I", ruby_config, joinpath(ruby_config, "print_cfg.rb"),
- "-c", str(protocol),
- "-r", joinpath(ruby_config, config_file), "-p", str(cores),
- "-m", str(memories), "-s", str(memory_size), "-C",
str(cache_size),
- "-A", str(cache_assoc), "-D", str(dmas)]
-
- temp_config = joinpath(m5.options.outdir, "ruby.config")
- ret = subprocess.call(args, stdout=file(temp_config, "w"))
- if ret != 0:
- raise RuntimeError, "subprocess failed!"
-
- return m5.objects.RubyMemory(clock = ruby_tick,
- config_file = temp_config,
- num_cpus = cores,
- range = AddrRange(str(memory_size)+"MB"),
- num_dmas = dmas,
- ports_per_core = ports_per_cpu)
diff -r a162a2b0b1f8 -r 5bd33f7c26ea tests/configs/rubytest-ruby.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/configs/rubytest-ruby.py Fri Jan 29 20:29:40 2010 -0800
@@ -0,0 +1,103 @@
+# Copyright (c) 2006-2007 The Regents of The University of Michigan
+# Copyright (c) 2009 Advanced Micro Devices, Inc.
+# 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: Ron Dreslinski
+# Brad Beckmann
+
+import m5
+from m5.objects import *
+from m5.defines import buildEnv
+from m5.util import addToPath
+import os, optparse, sys
+
+if buildEnv['FULL_SYSTEM']:
+ panic("This script requires system-emulation mode (*_SE).")
+
+# Get paths we might need. It's expected this file is in m5/configs/example.
+config_path = os.path.dirname(os.path.abspath(__file__))
+config_root = os.path.dirname(config_path)
+m5_root = os.path.dirname(config_root)
+addToPath(config_root+'/configs/common')
+addToPath(config_root+'/configs/ruby')
+
+import Ruby
+
+parser = optparse.OptionParser()
+
+#
+# Set the default cache size and associativity to be very small to encourage
+# races between requests and writebacks.
+#
+parser.add_option("--l1d_size", type="string", default="256B")
+parser.add_option("--l1i_size", type="string", default="256B")
+parser.add_option("--l2_size", type="string", default="512B")
+parser.add_option("--l1d_assoc", type="int", default=2)
+parser.add_option("--l1i_assoc", type="int", default=2)
+parser.add_option("--l2_assoc", type="int", default=2)
+
+execfile(os.path.join(config_root, "configs/common", "Options.py"))
+
+(options, args) = parser.parse_args()
+
+#
+# create the tester and system, including ruby
+#
+tester = RubyTester(checks_to_complete = 100, wakeup_frequency = 10)
+
+system = System(physmem = PhysicalMemory())
+
+system.ruby = Ruby.create_system(options, system.physmem)
+
+assert(options.num_cpus == len(system.ruby.cpu_ruby_ports))
+
+#
+# The tester is most effective when randomization is turned on and
+# artifical delay is randomly inserted on messages
+#
+system.ruby.randomization = True
+
+for ruby_port in system.ruby.cpu_ruby_ports:
+ #
+ # Tie the ruby tester ports to the ruby cpu ports
+ #
+ tester.cpuPort = ruby_port.port
+
+ #
+ # Tell the sequencer this is the ruby tester so that it
+ # copies the subblock back to the checker
+ #
+ ruby_port.using_ruby_tester = True
+
+# -----------------------
+# run simulation
+# -----------------------
+
+root = Root( system = system )
+root.system.mem_mode = 'timing'
+
+# Not much point in this being higher than the L1 latency
+m5.ticks.setGlobalFrequency('1ns')
diff -r a162a2b0b1f8 -r 5bd33f7c26ea tests/configs/simple-atomic-ruby.py
--- a/tests/configs/simple-atomic-ruby.py Fri Jan 29 20:29:34 2010 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-# Copyright (c) 2006-2007 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 m5
-from m5.objects import *
-
-import ruby_config
-ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", 1)
-
-system = System(cpu = AtomicSimpleCPU(cpu_id=0),
- physmem = ruby_memory,
- membus = Bus())
-system.physmem.port = system.membus.port
-system.cpu.connectMemPorts(system.membus)
-system.cpu.clock = '2GHz'
-
-root = Root(system = system)
diff -r a162a2b0b1f8 -r 5bd33f7c26ea tests/configs/simple-timing-mp-ruby.py
--- a/tests/configs/simple-timing-mp-ruby.py Fri Jan 29 20:29:34 2010 -0800
+++ b/tests/configs/simple-timing-mp-ruby.py Fri Jan 29 20:29:40 2010 -0800
@@ -28,24 +28,59 @@
import m5
from m5.objects import *
+from m5.defines import buildEnv
+from m5.util import addToPath
+import os, optparse, sys
+
+if buildEnv['FULL_SYSTEM']:
+ panic("This script requires system-emulation mode (*_SE).")
+
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
