style: Strip newline when checking lines

[gem5.git] / tests / configs / memtest-ruby.py

diff --git a/tests/configs/memtest-ruby.py b/tests/configs/memtest-ruby.py
index d2be2791ec8e608cdd79c10ab28e980ea3732d84..221d28b2ed5ac6dbb0721edc157979bcacd1292f 100644 (file)
--- a/tests/configs/memtest-ruby.py
+++ b/tests/configs/memtest-ruby.py
@@ -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
@@ -28,29 +29,99 @@
 
 import m5
 from m5.objects import *
+from m5.defines import buildEnv
+from m5.util import addToPath
+import os, optparse, sys
 
+# Get paths we might need
+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')
+addToPath(config_root+'/configs/topologies')
+
+import Ruby
+import Options
+
+parser = optparse.OptionParser()
+Options.addCommonOptions(parser)
+
+# Add the ruby specific and protocol specific options
+Ruby.define_options(parser)
+
+(options, args) = parser.parse_args()
+
+#
+# Set the default cache size and associativity to be very small to encourage
+# races between requests and writebacks.
+#
+options.l1d_size="256B"
+options.l1i_size="256B"
+options.l2_size="512B"
+options.l3_size="1kB"
+options.l1d_assoc=2
+options.l1i_assoc=2
+options.l2_assoc=2
+options.l3_assoc=2
+options.ports=32
 
 #MAX CORES IS 8 with the fals sharing method
 nb_cores = 8
-cpus = [ MemTest() for i in xrange(nb_cores) ]
 
-import ruby_config
-ruby_memory = ruby_config.generate("TwoLevel_SplitL1UnifiedL2.rb", nb_cores)
+# ruby does not support atomic, functional, or uncacheable accesses
+cpus = [ MemTest(percent_functional=50,
+                 percent_uncacheable=0, suppress_func_warnings=True) \
+         for i in xrange(nb_cores) ]
+
+# overwrite options.num_cpus with the nb_cores value
+options.num_cpus = nb_cores
 
 # system simulated
-system = System(cpu = cpus, funcmem = PhysicalMemory(),
-                physmem = ruby_memory,
-                membus = Bus(clock="500GHz", width=16))
+system = System(cpu = cpus)
+# Dummy voltage domain for all our clock domains
+system.voltage_domain = VoltageDomain()
+system.clk_domain = SrcClockDomain(clock = '1GHz',
+                                   voltage_domain = system.voltage_domain)
 
+# Create a seperate clock domain for components that should run at
+# CPUs frequency
+system.cpu_clk_domain = SrcClockDomain(clock = '2GHz',
+                                       voltage_domain = system.voltage_domain)
+
+# All cpus are associated with cpu_clk_domain
 for cpu in cpus:
-    cpu.test = system.membus.port
-    cpu.functional = system.funcmem.port
+    cpu.clk_domain = system.cpu_clk_domain
+
+system.mem_ranges = AddrRange('256MB')
+
+Ruby.create_system(options, False, system)
+
+# Create a separate clock domain for Ruby
+system.ruby.clk_domain = SrcClockDomain(clock = options.ruby_clock,
+                                        voltage_domain = system.voltage_domain)
 
-system.physmem.port = system.membus.port
+assert(len(cpus) == len(system.ruby._cpu_ports))
+
+for (i, ruby_port) in enumerate(system.ruby._cpu_ports):
+     #
+     # Tie the cpu port to the ruby cpu ports and
+     # physmem, respectively
+     #
+     cpus[i].port = ruby_port.slave
+
+     #
+     # Since the memtester is incredibly bursty, increase the deadlock
+     # threshold to 1 million cycles
+     #
+     ruby_port.deadlock_threshold = 1000000
 
 # -----------------------
 # run simulation
 # -----------------------
 
-root = Root(system = system)
+root = Root(full_system = False, system = system)
 root.system.mem_mode = 'timing'
+
+# Not much point in this being higher than the L1 latency
+m5.ticks.setGlobalFrequency('1ns')