X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Farch%2FSConscript;h=b022cb01fa7469ca2acc8ec64581e374364133cc;hb=9d8fec0d90c2121a092c04da74e3306069ab5270;hp=10ed03c3d5ceff8a788eb53e6d25b496a98e2fec;hpb=1068ca85d0a29bfa71dc6a21a8d6c8888dce4bc3;p=gem5.git diff --git a/src/arch/SConscript b/src/arch/SConscript index 10ed03c3d..b022cb01f 100644 --- a/src/arch/SConscript +++ b/src/arch/SConscript @@ -29,6 +29,8 @@ # Authors: Steve Reinhardt import sys +import os +import re Import('*') @@ -43,18 +45,17 @@ Import('*') # List of headers to generate isa_switch_hdrs = Split(''' - arguments.hh - faults.hh + decoder.hh interrupts.hh - isa.hh + isa.hh isa_traits.hh kernel_stats.hh locked_mem.hh microcode_rom.hh - mmaped_ipr.hh + mmapped_ipr.hh mt.hh process.hh - predecoder.hh + pseudo_inst.hh registers.hh remote_gdb.hh stacktrace.hh @@ -67,6 +68,14 @@ isa_switch_hdrs = Split(''' # Set up this directory to support switching headers make_switching_dir('arch', isa_switch_hdrs, env) +if env['BUILD_GPU']: + gpu_isa_switch_hdrs = Split(''' + gpu_decoder.hh + gpu_types.hh + ''') + + make_gpu_switching_dir('arch', gpu_isa_switch_hdrs, env) + ################################################################# # # Include architecture-specific files. @@ -90,35 +99,54 @@ env.Append(SCANNERS = isa_scanner) # output from the ISA description (*.isa) files. # +isa_parser = File('isa_parser.py') + # The emitter patches up the sources & targets to include the # autogenerated files as targets and isa parser itself as a source. def isa_desc_emitter(target, source, env): - cpu_models = list(env['CPU_MODELS']) - if env['USE_CHECKER']: - cpu_models.append('CheckerCPU') - - # Several files are generated from the ISA description. - # We always get the basic decoder and header file. - target = [ 'decoder.cc', 'decoder.hh', 'max_inst_regs.hh' ] - # We also get an execute file for each selected CPU model. - target += [CpuModel.dict[cpu].filename for cpu in cpu_models] - - return target, source + [ Value(m) for m in cpu_models ] + # List the isa parser as a source. + source += [ + isa_parser, + Value("ExecContext"), + ] + + # Specify different targets depending on if we're running the ISA + # parser for its dependency information, or for the generated files. + # (As an optimization, the ISA parser detects the useless second run + # and skips doing any work, if the first run was performed, since it + # always generates all its files). The way we track this in SCons is the + # _isa_outputs value in the environment (env). If it's unset, we + # don't know what the dependencies are so we ask for generated/inc.d to + # be generated so they can be acquired. If we know what they are, then + # it's because we've already processed inc.d and then claim that our + # outputs (targets) will be thus. + isa = env['TARGET_ISA'] + key = '%s_isa_outputs' % isa + if key in env: + targets = [ os.path.join('generated', f) for f in env[key] ] + else: + targets = [ os.path.join('generated','inc.d') ] + + def prefix(s): + return os.path.join(target[0].dir.up().abspath, s) + + return [ prefix(t) for t in targets ], source ARCH_DIR = Dir('.') # import ply here because SCons screws with sys.path when performing actions. import ply -def isa_desc_action(target, source, env): +def isa_desc_action_func(target, source, env): # Add the current directory to the system path so we can import files sys.path[0:0] = [ ARCH_DIR.srcnode().abspath ] import isa_parser - models = [ s.get_contents() for s in source[1:] ] - cpu_models = [CpuModel.dict[cpu] for cpu in models] - parser = isa_parser.ISAParser(target[0].dir.abspath, cpu_models) + # Skip over the ISA description itself and the parser to the CPU models. + models = [ s.get_contents() for s in source[2:] ] + parser = isa_parser.ISAParser(target[0].dir.abspath) parser.parse_isa_desc(source[0].abspath) +isa_desc_action = MakeAction(isa_desc_action_func, Transform("ISA DESC", 1)) # Also include the CheckerCPU as one of the models if it is being # enabled via command line. @@ -126,7 +154,55 @@ isa_desc_builder = Builder(action=isa_desc_action, emitter=isa_desc_emitter) env.Append(BUILDERS = { 'ISADesc' : isa_desc_builder }) -TraceFlag('IntRegs') -TraceFlag('FloatRegs') -TraceFlag('MiscRegs') -CompoundFlag('Registers', [ 'IntRegs', 'FloatRegs', 'MiscRegs' ]) +# The ISA is generated twice: the first time to find out what it generates, +# and the second time to make scons happy by telling the ISADesc builder +# what it will make before it builds it. +def scan_isa_deps(target, source, env): + # Process dependency file generated by the ISA parser -- + # add the listed files to the dependency tree of the build. + source = source[0] + archbase = source.dir.up().path + + try: + depfile = open(source.abspath, 'r') + except: + print "scan_isa_deps: Can't open ISA deps file '%s' in %s" % \ + (source.path,os.getcwd()) + raise + + # Scan through the lines + targets = {} + for line in depfile: + # Read the dependency line with the format + # : [ * ] + m = re.match(r'^\s*([^:]+\.([^\.:]+))\s*:\s*(.*)', line) + assert(m) + targ, extn = m.group(1,2) + deps = m.group(3).split() + + files = [ targ ] + deps + for f in files: + targets[f] = True + # Eliminate unnecessary re-generation if we already generated it + env.Precious(os.path.join(archbase, 'generated', f)) + + files = [ os.path.join(archbase, 'generated', f) for f in files ] + + if extn == 'cc': + Source(os.path.join(archbase,'generated', targ)) + depfile.close() + env[env['TARGET_ISA'] + '_isa_outputs'] = targets.keys() + + isa = env.ISADesc(os.path.join(archbase,'isa','main.isa')) + for t in targets: + env.Depends('#all-isas', isa) + +env.Append(BUILDERS = {'ScanISA' : + Builder(action=MakeAction(scan_isa_deps, + Transform("NEW DEPS", 1)))}) + +DebugFlag('IntRegs') +DebugFlag('FloatRegs') +DebugFlag('CCRegs') +DebugFlag('MiscRegs') +CompoundFlag('Registers', [ 'IntRegs', 'FloatRegs', 'CCRegs', 'MiscRegs' ])