From 7ccdb7accc073d282e9df804da400394a795b2ae Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Sat, 22 Jul 2006 15:50:39 -0400
Subject: Last minute check in.  Very few functional changes other than some
 minor config updates.  Also include some recently generated stats.

SConstruct:
    Make test CPUs option non-sticky.
configs/common/FSConfig.py:
    Be sure to set the memory mode.
configs/test/fs.py:
    Wrong string.
tests/SConscript:
    Only test valid CPUs that have been compiled in.
tests/test1/ref/alpha/atomic/config.ini:
tests/test1/ref/alpha/atomic/config.out:
tests/test1/ref/alpha/atomic/m5stats.txt:
tests/test1/ref/alpha/atomic/stdout:
tests/test1/ref/alpha/detailed/config.ini:
tests/test1/ref/alpha/detailed/config.out:
tests/test1/ref/alpha/detailed/m5stats.txt:
tests/test1/ref/alpha/detailed/stdout:
tests/test1/ref/alpha/timing/config.ini:
tests/test1/ref/alpha/timing/config.out:
tests/test1/ref/alpha/timing/m5stats.txt:
tests/test1/ref/alpha/timing/stdout:
    Update output.

--HG--
extra : convert_revision : 6eee2a5eae0291b5121b41bcd7021179cdd520a3
---
 configs/common/FSConfig.py | 2 +-
 configs/test/fs.py         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'configs')

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 5b0de2d6d..bf6817c7a 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -74,7 +74,7 @@ def MyLinuxAlphaSystem(cpu, mem_mode, linux_image, icache=None, dcache=None, l2c
                                                read_only = True))
     self.intrctrl = IntrControl()
     self.cpu = cpu
-
+    self.mem_mode = mem_mode
     connectCpu(self.cpu, self.membus, icache, dcache, l2cache)
     for each_cpu in listWrapper(self.cpu):
         each_cpu.itb = AlphaITB()
diff --git a/configs/test/fs.py b/configs/test/fs.py
index 5468c5924..004edda79 100644
--- a/configs/test/fs.py
+++ b/configs/test/fs.py
@@ -25,15 +25,15 @@ if args:
 if options.detailed:
     cpu = DetailedO3CPU()
     cpu2 = DetailedO3CPU()
-    mem_mode = 'Timing'
+    mem_mode = 'timing'
 elif options.timing:
     cpu = TimingSimpleCPU()
     cpu2 = TimingSimpleCPU()
-    mem_mode = 'Timing'
+    mem_mode = 'timing'
 else:
     cpu = AtomicSimpleCPU()
     cpu2 = AtomicSimpleCPU()
-    mem_mode = 'Atomic'
+    mem_mode = 'atomic'
 
 if options.dual:
     root = DualRoot(
-- 
cgit v1.2.3