X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConscript;h=360f91b3a507da8469e082f9299ac0d89bfabd26;hb=71bf22165acb4a330a98e183f96188daf49d078f;hp=5b96f5b4be3f7e980799e128504d5c660f7383e6;hpb=e71ee12eacb115289ce96f9a384dd2c0567270a7;p=gem5.git diff --git a/SConscript b/SConscript index 5b96f5b4b..360f91b3a 100644 --- a/SConscript +++ b/SConscript @@ -1,6 +1,6 @@ # -*- mode:python -*- -# Copyright (c) 2004 The Regents of The University of Michigan +# Copyright (c) 2004-2005 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -43,15 +43,8 @@ Import('env') ################################################### # Base sources used by all configurations. -base_sources = Split(''' - arch/alpha/decoder.cc - arch/alpha/alpha_o3_exec.cc - arch/alpha/fast_cpu_exec.cc - arch/alpha/simple_cpu_exec.cc - arch/alpha/full_cpu_exec.cc - arch/alpha/faults.cc - arch/alpha/isa_traits.cc +base_sources = Split(''' base/circlebuf.cc base/copyright.cc base/cprintf.cc @@ -66,7 +59,6 @@ base_sources = Split(''' base/misc.cc base/output.cc base/pollevent.cc - base/python.cc base/range.cc base/random.cc base/sat_counter.cc @@ -84,7 +76,6 @@ base_sources = Split(''' base/loader/object_file.cc base/loader/symtab.cc base/stats/events.cc - base/stats/python.cc base/stats/statdb.cc base/stats/visit.cc base/stats/text.cc @@ -124,6 +115,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 @@ -143,7 +136,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 @@ -190,20 +182,18 @@ base_sources = Split(''' mem/cache/miss/mshr.cc mem/cache/miss/mshr_queue.cc mem/cache/prefetch/base_prefetcher.cc - mem/cache/prefetch/ghb_prefetcher.cc mem/cache/prefetch/prefetcher.cc - mem/cache/prefetch/stride_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/split.cc - mem/cache/tags/split_lifo.cc - mem/cache/tags/split_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 @@ -219,6 +209,7 @@ base_sources = Split(''' sim/configfile.cc sim/debug.cc sim/eventq.cc + sim/faults.cc sim/main.cc sim/param.cc sim/profile.cc @@ -232,6 +223,14 @@ base_sources = Split(''' sim/stat_control.cc sim/trace_context.cc ''') +# These are now included by the architecture specific SConscript +# arch/alpha/decoder.cc +# arch/alpha/alpha_o3_exec.cc +# arch/alpha/fast_cpu_exec.cc +# arch/alpha/simple_cpu_exec.cc +# arch/alpha/full_cpu_exec.cc +# arch/alpha/faults.cc +# arch/alpha/isa_traits.cc # MySql sources mysql_sources = Split(''' @@ -241,18 +240,12 @@ mysql_sources = Split(''' # Full-system sources full_system_sources = Split(''' - arch/alpha/alpha_memory.cc - arch/alpha/arguments.cc - arch/alpha/ev5.cc - arch/alpha/osfpal.cc - arch/alpha/pseudo_inst.cc - arch/alpha/vtophys.cc - base/crc.cc base/inet.cc base/remote_gdb.cc cpu/intr_control.cc + cpu/profile.cc dev/alpha_console.cc dev/baddev.cc @@ -270,13 +263,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 @@ -285,7 +279,7 @@ full_system_sources = Split(''' kern/kernel_binning.cc kern/kernel_stats.cc kern/system_events.cc - kern/linux/linux_events.cc + kern/freebsd/freebsd_system.cc kern/linux/linux_syscalls.cc kern/linux/linux_system.cc kern/linux/printk.cc @@ -299,8 +293,18 @@ full_system_sources = Split(''' mem/functional/physical.cc sim/system.cc + sim/pseudo_inst.cc ''') +# These are now included by the architecture specific SConscript +# arch/alpha/alpha_memory.cc +# arch/alpha/arguments.cc +# arch/alpha/ev5.cc +# arch/alpha/osfpal.cc +# arch/alpha/pseudo_inst.cc +# arch/alpha/stacktrace.cc +# arch/alpha/vtophys.cc + # turbolaser encumbered sources turbolaser_sources = Split(''' encumbered/dev/dma.cc @@ -323,12 +327,7 @@ turbolaser_sources = Split(''' # Syscall emulation (non-full-system) sources syscall_emulation_sources = Split(''' - arch/alpha/alpha_common_syscall_emul.cc - 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 @@ -336,33 +335,46 @@ syscall_emulation_sources = Split(''' sim/syscall_emul.cc ''') +# These are now included by the architecture specific SConscript +# arch/alpha/alpha_common_syscall_emul.cc +# arch/alpha/alpha_linux_process.cc +# arch/alpha/alpha_tru64_process.cc + targetarch_files = Split(''' - alpha_common_syscall_emul.hh alpha_linux_process.hh alpha_memory.hh alpha_tru64_process.hh aout_machdep.h arguments.hh - byte_swap.hh ecoff_machdep.h - elf_machdep.h ev5.hh faults.hh - isa_fullsys_traits.hh - isa_traits.hh - osfpal.hh - pseudo_inst.hh - vptr.hh + stacktrace.hh vtophys.hh ''') - +# pseudo_inst.hh +# isa_traits.hh +# osfpal.hh +# byte_swap.hh +# alpha_common_syscall_emul.hh +# vptr.hh +# isa_fullsys_traits.hh + +# Set up bridging headers to the architecture specific versions for f in targetarch_files: - env.Command('targetarch/' + f, 'arch/alpha/' + f, - '''echo '#include "arch/alpha/%s"' > $TARGET''' % f) + env.Command('targetarch/' + f, 'arch/%s/%s' % (env['TARGET_ISA'], f), + '''echo '#include "arch/%s/%s"' > $TARGET''' % (env['TARGET_ISA'], f)) + +# Let the target architecture define what sources it needs +arch_source = SConscript('arch/%s/SConscript' % env['TARGET_ISA'], + build_dir = 'build/%s/' % env['BUILD_DIR'], + exports = 'env', duplicate = False) +# Add a flag defining what THE_ISA should be for all compilation +env.Append(CPPDEFINES=[('THE_ISA','%s_ISA' % env['TARGET_ISA'].upper())]) # Set up complete list of sources based on configuration. -sources = base_sources +sources = base_sources + arch_source if env['FULL_SYSTEM']: sources += full_system_sources @@ -371,19 +383,33 @@ 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) +################################################### +# +# Add an SCons scanner for ISA files +# +################################################### +import SCons.Scanner + +def ISAScan(): + return SCons.Scanner.Classic("ISAScan", + "$ISASUFFIXES", + "SRCDIR", + '^[ \t]*##[ \t]*include[ \t]*"([^>"]+)"') + +def ISAPath(env, dir, target=None, source=None, a=None): + return (Dir(env['SRCDIR']), Dir('.')) + +iscan = Scanner(function = ISAScan().scan, skeys = [".isa", ".ISA"], + path_function = ISAPath) +env.Append(SCANNERS = iscan) + + ################################################### # # Special build rules. @@ -397,15 +423,24 @@ env.Command(Split('base/traceflags.hh base/traceflags.cc'), 'python $SOURCE $TARGET.base') # several files are generated from arch/$TARGET_ISA/isa_desc. -env.Command(Split('''arch/alpha/decoder.cc - arch/alpha/decoder.hh - arch/alpha/alpha_o3_exec.cc - arch/alpha/fast_cpu_exec.cc - arch/alpha/simple_cpu_exec.cc - arch/alpha/full_cpu_exec.cc'''), - Split('''arch/alpha/isa_desc - arch/isa_parser.py'''), - '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/alpha') +env.Command(Split(''' + arch/%s/decoder.cc + arch/%s/decoder.hh + arch/%s/alpha_o3_exec.cc + arch/%s/fast_cpu_exec.cc + arch/%s/simple_cpu_exec.cc + arch/%s/full_cpu_exec.cc''' % + (env['TARGET_ISA'], + env['TARGET_ISA'], + env['TARGET_ISA'], + env['TARGET_ISA'], + env['TARGET_ISA'], + env['TARGET_ISA'])), + Split(''' + arch/%s/isa/main.isa + arch/isa_parser.py''' % + env['TARGET_ISA']), + '$SRCDIR/arch/isa_parser.py $SOURCE $TARGET.dir arch/%s' % env['TARGET_ISA']) # libelf build is described in its own SConscript file. @@ -426,7 +461,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 ################################################### @@ -443,25 +477,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')