Split off instantiation into separate CC files for each of the models. This makes it easier to be able to specify only certain CPU models.
src/cpu/SConscript:
Split off instantiations into separate CC files. This makes it easier to split them per CPU model.
src/cpu/base_dyn_inst_impl.hh:
Move instantations out of impl.hh file and into a cc file.
src/cpu/checker/cpu_impl.hh:
Move instantiations over to .cc files inside each CPU's directory. Makes it easier to only use what's actually included.
src/cpu/o3/bpred_unit.cc:
Pull Ozone instantiations out of this .cc file; put them into the ozone's CC file.
src/cpu/o3/checker_builder.cc:
Instantiate Checker for O3 CPU.
src/cpu/ozone/checker_builder.cc:
Instantiate Checker for Ozone CPU.
--HG--
rename : src/cpu/base_dyn_inst.cc => src/cpu/base_dyn_inst_impl.hh
rename : src/cpu/checker/cpu.cc => src/cpu/checker/cpu_impl.hh
rename : src/cpu/checker/o3_builder.cc => src/cpu/o3/checker_builder.cc
rename : src/cpu/checker/ozone_builder.cc => src/cpu/ozone/checker_builder.cc
extra : convert_revision : 4e5f928b165379c06d31071c544ea46cf0b8fa71
This commit is contained in:
@@ -122,11 +122,11 @@ if 'FastCPU' in env['CPU_MODELS']:
|
||||
|
||||
if 'AlphaO3CPU' in env['CPU_MODELS']:
|
||||
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
|
||||
@@ -149,7 +149,7 @@ if 'AlphaO3CPU' in env['CPU_MODELS']:
|
||||
o3/tournament_pred.cc
|
||||
''')
|
||||
if 'CheckerCPU' in env['CPU_MODELS']:
|
||||
sources += Split('checker/o3_builder.cc')
|
||||
sources += Split('o3/checker_builder.cc')
|
||||
|
||||
if 'OzoneSimpleCPU' in env['CPU_MODELS']:
|
||||
sources += Split('''
|
||||
@@ -161,18 +161,19 @@ if 'OzoneSimpleCPU' in env['CPU_MODELS']:
|
||||
ozone/inst_queue.cc
|
||||
ozone/rename_table.cc
|
||||
''')
|
||||
if 'CheckerCPU' in env['CPU_MODELS']:
|
||||
sources += Split('checker/ozone_builder.cc')
|
||||
|
||||
if 'OzoneCPU' in env['CPU_MODELS']:
|
||||
sources += Split('''
|
||||
ozone/base_dyn_inst.cc
|
||||
ozone/bpred_unit.cc
|
||||
ozone/lsq_unit.cc
|
||||
ozone/lw_back_end.cc
|
||||
ozone/lw_lsq.cc
|
||||
''')
|
||||
if 'CheckerCPU' in env['CPU_MODELS']:
|
||||
sources += Split('ozone/checker_builder.cc')
|
||||
|
||||
if 'CheckerCPU' in env['CPU_MODELS']:
|
||||
sources += Split('checker/cpu.cc')
|
||||
checker_supports = False
|
||||
for i in CheckerSupportedCPUList:
|
||||
if i in env['CPU_MODELS']:
|
||||
|
||||
Reference in New Issue
Block a user