Merge ktlim@zizzer:/bk/newmem

into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem-merge

configs/test/fs.py:
configs/test/test.py:
    SCCS merged

--HG--
extra : convert_revision : 7b2dbcd5881fac01dec38001c4131e73b5be52b5

1 files changed, 13 insertions, 1 deletions

diff --git a/configs/test/fs.py b/configs/test/fs.py
index 55fed7234..f4c50fc23 100644
--- a/configs/test/fs.py
+++ b/configs/test/fs.py
@@ -22,6 +22,8 @@ if args:
 # Base for tests is directory containing this file.
 test_base = os.path.dirname(__file__)
 
+script.dir =  '/z/saidi/work/m5.newmem/configs/boot'
+
 linux_image = env.get('LINUX_IMAGE', disk('linux-latest.img'))
 
 class CowIdeDisk(IdeDisk):
@@ -65,6 +67,7 @@ class MyLinuxAlphaSystem(LinuxAlphaSystem):
         cpu = DetailedO3CPU()
     elif options.timing:
         cpu = TimingSimpleCPU()
+        mem_mode = 'timing'
     else:
         cpu = AtomicSimpleCPU()
     cpu.mem = membus
@@ -72,6 +75,7 @@ class MyLinuxAlphaSystem(LinuxAlphaSystem):
     cpu.dcache_port = membus.port
     cpu.itb = AlphaITB()
     cpu.dtb = AlphaDTB()
+    cpu.clock = '2GHz'
     sim_console = SimConsole(listener=ConsoleListener(port=3456))
     kernel = binary('vmlinux')
     pal = binary('ts_osfpal')
@@ -90,7 +94,7 @@ def DualRoot(clientSystem, serverSystem):
     self.etherlink = EtherLink(int1 = Parent.client.tsunami.etherint[0],
                                int2 = Parent.server.tsunami.etherint[0],
                                dump = Parent.etherdump)
-    self.clock = '5GHz'
+    self.clock = '1THz'
     return self
 
 if options.dual:
@@ -102,6 +106,14 @@ else:
 
 m5.instantiate(root)
 
+#exit_event = m5.simulate(2600000000000)
+#if exit_event.getCause() != "user interrupt received":
+#    m5.checkpoint(root, 'cpt')
+#    exit_event = m5.simulate(300000000000)
+#    if exit_event.getCause() != "user interrupt received":
+#        m5.checkpoint(root, 'cptA')
+
+
 if options.maxtick:
     exit_event = m5.simulate(options.maxtick)
 else: