Merge zizzer:/bk/newmem

into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release

--HG--
extra : convert_revision : 9b5b1419e8e22bce16ed97fc02c2008ca0181afc

1 files changed, 4 insertions, 0 deletions

diff --git a/configs/test/test.py b/configs/test/test.py
index 8c5b06e6a..2ece9e675 100644
--- a/configs/test/test.py
+++ b/configs/test/test.py
@@ -6,12 +6,14 @@
 import os, optparse, sys
 import m5
 from m5.objects import *
+from FullO3Config import *
 
 # parse command-line arguments
 parser = optparse.OptionParser(option_list=m5.standardOptions)
 
 parser.add_option("-c", "--cmd", default="hello")
 parser.add_option("-t", "--timing", action="store_true")
+parser.add_option("-f", "--full", action="store_true")
 
 (options, args) = parser.parse_args()
 
@@ -31,6 +33,8 @@ mem = PhysicalMemory()
 
 if options.timing:
     cpu = TimingSimpleCPU()
+elif options.full:
+    cpu = DetailedCPU()
 else:
     cpu = AtomicSimpleCPU()
 cpu.workload = process