I left a printf in on accident.

[gem5.git] / SConscript

diff --git a/SConscript b/SConscript
index 5d4fc42e183df5b9b0d8a68bc026d69fbed056c7..677a06d1fb7948507ad29801185a6b9c7c376acf 100644 (file)
--- a/SConscript
+++ b/SConscript
@@ -122,6 +122,8 @@ base_sources = Split('''
         cpu/trace/reader/ibm_reader.cc
         cpu/trace/reader/itx_reader.cc
         cpu/trace/reader/m5_reader.cc
+        cpu/trace/opt_cpu.cc
+        cpu/trace/trace_cpu.cc
 
        encumbered/cpu/full/bpred.cc
        encumbered/cpu/full/commit.cc
@@ -141,7 +143,6 @@ base_sources = Split('''
        encumbered/cpu/full/issue.cc
        encumbered/cpu/full/ls_queue.cc
        encumbered/cpu/full/machine_queue.cc
-        encumbered/cpu/full/pc_sample_profile.cc
         encumbered/cpu/full/pipetrace.cc
         encumbered/cpu/full/readyq.cc
         encumbered/cpu/full/reg_info.cc
@@ -191,12 +192,15 @@ base_sources = Split('''
         mem/cache/prefetch/prefetcher.cc
         mem/cache/prefetch/tagged_prefetcher.cc
        mem/cache/tags/base_tags.cc
-       mem/cache/tags/cache_tags.cc
+       mem/cache/tags/cache_tags.cc    
        mem/cache/tags/fa_lru.cc
        mem/cache/tags/iic.cc
        mem/cache/tags/lru.cc
        mem/cache/tags/repl/gen.cc
        mem/cache/tags/repl/repl.cc
+       mem/cache/tags/split.cc
+       mem/cache/tags/split_lru.cc
+       mem/cache/tags/split_lifo.cc
        mem/functional/functional.cc
        mem/timing/base_memory.cc
        mem/timing/memory_builder.cc
@@ -239,6 +243,7 @@ full_system_sources = Split('''
        arch/alpha/ev5.cc
        arch/alpha/osfpal.cc
        arch/alpha/pseudo_inst.cc
+       arch/alpha/stacktrace.cc
        arch/alpha/vtophys.cc
 
        base/crc.cc
@@ -246,6 +251,7 @@ full_system_sources = Split('''
        base/remote_gdb.cc
 
        cpu/intr_control.cc
+        cpu/profile.cc
 
        dev/alpha_console.cc
        dev/baddev.cc
@@ -263,13 +269,14 @@ full_system_sources = Split('''
        dev/ns_gige.cc
        dev/pciconfigall.cc
        dev/pcidev.cc
+       dev/pcifake.cc
        dev/pktfifo.cc
-        dev/platform.cc
+       dev/platform.cc
        dev/sinic.cc
        dev/simple_disk.cc
        dev/tsunami.cc
        dev/tsunami_cchip.cc
-       dev/tsunami_fake.cc
+       dev/isa_fake.cc
        dev/tsunami_io.cc
        dev/tsunami_pchip.cc
        dev/uart.cc
@@ -279,7 +286,6 @@ full_system_sources = Split('''
        kern/kernel_stats.cc
        kern/system_events.cc
        kern/freebsd/freebsd_system.cc
-       kern/linux/linux_events.cc
        kern/linux/linux_syscalls.cc
        kern/linux/linux_system.cc
        kern/linux/printk.cc
@@ -321,8 +327,6 @@ syscall_emulation_sources = Split('''
        arch/alpha/alpha_linux_process.cc
        arch/alpha/alpha_tru64_process.cc
        cpu/memtest/memtest.cc
-        cpu/trace/opt_cpu.cc
-       cpu/trace/trace_cpu.cc
        encumbered/eio/eio.cc
        encumbered/eio/exolex.cc
        encumbered/eio/libexo.cc
@@ -345,6 +349,7 @@ targetarch_files = Split('''
         isa_traits.hh
         osfpal.hh
         pseudo_inst.hh
+        stacktrace.hh
         vptr.hh
         vtophys.hh
         ''')
@@ -364,18 +369,11 @@ if env['FULL_SYSTEM']:
 else:
     sources += syscall_emulation_sources
 
-extra_libraries = []
-env.Append(LIBS=['z'])
-if isdir('/usr/lib64/mysql') or isdir('/usr/lib/mysql') or \
-   isdir('/usr/local/lib/mysql'):
-    print 'Compiling with MySQL support!'
-    env.Append(LIBPATH=['/usr/lib64/mysql', '/usr/local/lib/mysql/',
-                        '/usr/lib/mysql'])
-    env.Append(CPPPATH=['/usr/local/include/mysql', '/usr/include/mysql'])
+if env['USE_MYSQL']:
     sources += mysql_sources
-    env.Append(CPPDEFINES = 'USE_MYSQL')
-    env.Append(CPPDEFINES = 'STATS_BINNING')
-    env.Append(LIBS=['mysqlclient'])
+
+for opt in env.ExportOptions:
+    env.ConfigFile(opt)
 
 ###################################################
 #
@@ -419,7 +417,6 @@ def make_objs(sources, env):
     date_obj = env.Object('base/date.cc')
     env.Depends(date_obj, objs)
     objs.append(date_obj)
-    objs.extend(extra_libraries)
     return objs
 
 ###################################################
@@ -436,25 +433,42 @@ def make_objs(sources, env):
 env.Append(CPPPATH='.')
 
 # Debug binary
-debug = env.Copy(OBJSUFFIX='.do')
-debug.Append(CCFLAGS=Split('-g -gstabs+ -O0'))
-debug.Append(CPPDEFINES='DEBUG')
-debug.Program(target = 'm5.debug', source = make_objs(sources, debug))
+debugEnv = env.Copy(OBJSUFFIX='.do')
+debugEnv.Label = 'debug'
+debugEnv.Append(CCFLAGS=Split('-g -gstabs+ -O0'))
+debugEnv.Append(CPPDEFINES='DEBUG')
+tlist = debugEnv.Program(target = 'm5.debug',
+                         source = make_objs(sources, debugEnv))
+debugEnv.M5Binary = tlist[0]
 
 # Optimized binary
-opt = env.Copy()
-opt.Append(CCFLAGS=Split('-g -O5'))
-opt.Program(target = 'm5.opt', source = make_objs(sources, opt))
+optEnv = env.Copy()
+optEnv.Label = 'opt'
+optEnv.Append(CCFLAGS=Split('-g -O5'))
+tlist = optEnv.Program(target = 'm5.opt',
+                       source = make_objs(sources, optEnv))
+optEnv.M5Binary = tlist[0]
 
 # "Fast" binary
-fast = env.Copy(OBJSUFFIX='.fo')
-fast.Append(CCFLAGS=Split('-O5'))
-fast.Append(CPPDEFINES='NDEBUG')
-fast.Program(target = 'm5.fast.unstripped', source = make_objs(sources, fast))
-fast.Command(target = 'm5.fast', source = 'm5.fast.unstripped',
-             action = 'strip $SOURCE -o $TARGET')
+fastEnv = env.Copy(OBJSUFFIX='.fo')
+fastEnv.Label = 'fast'
+fastEnv.Append(CCFLAGS=Split('-O5'))
+fastEnv.Append(CPPDEFINES='NDEBUG')
+fastEnv.Program(target = 'm5.fast.unstripped',
+                source = make_objs(sources, fastEnv))
+tlist = fastEnv.Command(target = 'm5.fast',
+                        source = 'm5.fast.unstripped',
+                        action = 'strip $SOURCE -o $TARGET')
+fastEnv.M5Binary = tlist[0]
 
 # Profiled binary
-prof = env.Copy(OBJSUFFIX='.po')
-prof.Append(CCFLAGS=Split('-O5 -g -pg'), LINKFLAGS='-pg')
-prof.Program(target = 'm5.prof', source = make_objs(sources, prof))
+profEnv = env.Copy(OBJSUFFIX='.po')
+profEnv.Label = 'prof'
+profEnv.Append(CCFLAGS=Split('-O5 -g -pg'), LINKFLAGS='-pg')
+tlist = profEnv.Program(target = 'm5.prof',
+                        source = make_objs(sources, profEnv))
+profEnv.M5Binary = tlist[0]
+
+envList = [debugEnv, optEnv, fastEnv, profEnv]
+
+Return('envList')