Split off files that are shared across the O3 and Ozone models.

--HG--
extra : convert_revision : 023e84660d5cee5162d39548f87e5ca8ec68115f

1 files changed, 11 insertions, 4 deletions

diff --git a/src/cpu/SConscript b/src/cpu/SConscript
index baa5d531e..8b584ba57 100644
--- a/src/cpu/SConscript
+++ b/src/cpu/SConscript
@@ -130,15 +130,15 @@ if need_simple_base:
 if 'FastCPU' in env['CPU_MODELS']:
     sources += Split('fast/cpu.cc')
 
+need_bp_unit = False
 if 'AlphaO3CPU' in env['CPU_MODELS']:
+    need_bp_unit = True
     sources += Split('''
-        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
@@ -150,18 +150,17 @@ if 'AlphaO3CPU' 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 'OzoneCPU' in env['CPU_MODELS']:
+    need_bp_unit = True
     sources += Split('''
         ozone/base_dyn_inst.cc
         ozone/bpred_unit.cc
@@ -176,6 +175,14 @@ if 'OzoneCPU' in env['CPU_MODELS']:
     if env['USE_CHECKER']:
         sources += Split('ozone/checker_builder.cc')
 
+if need_bp_unit:
+    sources += Split('''
+        o3/2bit_local_pred.cc
+        o3/btb.cc
+        o3/ras.cc
+        o3/tournament_pred.cc
+        ''')
+
 if env['USE_CHECKER']:
     sources += Split('checker/cpu.cc')
     checker_supports = False