Merge m5.eecs.umich.edu:/bk/newmem

into  ewok.(none):/home/gblack/m5/newmem

--HG--
extra : convert_revision : 516c357f98c7a571c70362babd3fa162fbc2ed5a

1 files changed, 51 insertions, 25 deletions

diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index 34bad132c..bc4ec7923 100644
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -68,6 +68,13 @@ mem_comp_sig_template = '''
 virtual Fault completeAcc(uint8_t *data, %s *xc, Trace::InstRecord *traceData) const { panic("Not defined!"); return NoFault; };
 '''
 
+# Generate a temporary CPU list, including the CheckerCPU if
+# it's enabled.  This isn't used for anything else other than StaticInst
+# headers.
+temp_cpu_list = env['CPU_MODELS']
+if env['USE_CHECKER']:
+    temp_cpu_list.append('CheckerCPU')
+
 # Generate header.  
 def gen_cpu_exec_signatures(target, source, env):
     f = open(str(target[0]), 'w')
@@ -75,7 +82,7 @@ def gen_cpu_exec_signatures(target, source, env):
 #ifndef __CPU_STATIC_INST_EXEC_SIGS_HH__
 #define __CPU_STATIC_INST_EXEC_SIGS_HH__
 '''
-    for cpu in env['CPU_MODELS']:
+    for cpu in temp_cpu_list:
         xc_type = CpuModel.dict[cpu].strings['CPU_exec_context']
         print >> f, exec_sig_template % (xc_type, xc_type, xc_type)
     print >> f, '''
@@ -85,12 +92,19 @@ def gen_cpu_exec_signatures(target, source, env):
 # Generate string that gets printed when header is rebuilt
 def gen_sigs_string(target, source, env):
     return "Generating static_inst_exec_sigs.hh: " \
-           + ', '.join(env['CPU_MODELS'])
+           + ', '.join(temp_cpu_list)
 
 # Add command to generate header to environment.
 env.Command('static_inst_exec_sigs.hh', models_db,
             Action(gen_cpu_exec_signatures, gen_sigs_string,
-                   varlist = ['CPU_MODELS']))
+                   varlist = temp_cpu_list))
+
+env.Depends('static_inst_exec_sigs.hh', Value(env['USE_CHECKER']))
+env.Depends('static_inst_exec_sigs.hh', Value(env['CPU_MODELS']))
+
+# List of suppported CPUs by the Checker.  Errors out if USE_CHECKER=True
+# and one of these are not being used.
+CheckerSupportedCPUList = ['O3CPU', 'OzoneCPU']
 
 #################################################################
 #
@@ -116,15 +130,13 @@ if need_simple_base:
 if 'FastCPU' in env['CPU_MODELS']:
     sources += Split('fast/cpu.cc')
 
-if 'AlphaFullCPU' in env['CPU_MODELS']:
+need_bp_unit = False
+if 'O3CPU' in env['CPU_MODELS']:
+    need_bp_unit = True
+    sources += SConscript('o3/SConscript', exports = 'env')
     sources += Split('''
-        base_dyn_inst.cc
-        o3/2bit_local_pred.cc
-        o3/alpha_dyn_inst.cc
-        o3/alpha_cpu.cc
-        o3/alpha_cpu_builder.cc
+        o3/base_dyn_inst.cc
         o3/bpred_unit.cc
-        o3/btb.cc
         o3/commit.cc
         o3/decode.cc
         o3/fetch.cc
@@ -136,40 +148,54 @@ if 'AlphaFullCPU' in env['CPU_MODELS']:
         o3/lsq_unit.cc
         o3/lsq.cc
         o3/mem_dep_unit.cc
-        o3/ras.cc
         o3/rename.cc
         o3/rename_map.cc
         o3/rob.cc
         o3/scoreboard.cc
         o3/store_set.cc
-        o3/tournament_pred.cc
         ''')
+    if env['USE_CHECKER']:
+        sources += Split('o3/checker_builder.cc')
 
-if 'OzoneSimpleCPU' in env['CPU_MODELS']:
+if 'OzoneCPU' in env['CPU_MODELS']:
+    need_bp_unit = True
     sources += Split('''
+        ozone/base_dyn_inst.cc
+        ozone/bpred_unit.cc
         ozone/cpu.cc
         ozone/cpu_builder.cc
         ozone/dyn_inst.cc
         ozone/front_end.cc
-        ozone/inorder_back_end.cc
-        ozone/inst_queue.cc
-        ozone/rename_table.cc
-        ''')
-
-if 'OzoneCPU' in env['CPU_MODELS']:
-    sources += Split('''
-        ozone/lsq_unit.cc
         ozone/lw_back_end.cc
         ozone/lw_lsq.cc
+        ozone/rename_table.cc
         ''')
+    if env['USE_CHECKER']:
+        sources += Split('ozone/checker_builder.cc')
 
-if 'CheckerCPU' in env['CPU_MODELS']:
+if need_bp_unit:
     sources += Split('''
-        checker/cpu.cc
-        checker/o3_cpu_builder.cc
+        o3/2bit_local_pred.cc
+        o3/btb.cc
+        o3/ras.cc
+        o3/tournament_pred.cc
         ''')
 
-# FullCPU sources are included from m5/SConscript since they're not
+if env['USE_CHECKER']:
+    sources += Split('checker/cpu.cc')
+    checker_supports = False
+    for i in CheckerSupportedCPUList:
+        if i in env['CPU_MODELS']:
+            checker_supports = True
+    if not checker_supports:
+        print "Checker only supports CPU models",
+        for i in CheckerSupportedCPUList:
+            print i,
+        print ", please set USE_CHECKER=False or use one of those CPU models"              
+        Exit(1)
+
+
+# FullCPU sources are included from src/SConscript since they're not
 # below this point in the file hierarchy.
 
 # Convert file names to SCons File objects.  This takes care of the