diff -r 7338bc628489 -r 7beb0e825ec3 SConstruct --- a/SConstruct Mon Jan 03 14:35:47 2011 -0800 +++ b/SConstruct Mon Jan 03 16:09:45 2011 -0800 @@ -357,7 +357,7 @@ # the ext directory should be on the #includes path main.Append(CPPPATH=[Dir('ext')]) -def _STRIP(path, env): +def strip_build_path(path, env): path = str(path) variant_base = env['BUILDROOT'] + os.path.sep if path.startswith(variant_base): @@ -366,29 +366,73 @@ path = path[6:] return path -def _STRIP_SOURCE(target, source, env, for_signature): - return _STRIP(source[0], env) -main['STRIP_SOURCE'] = _STRIP_SOURCE +# Generate a string of the form: +# common/path/prefix: src1, src2 -> tgt1, tgt2 +# to print while building. +def _TRANSFORMATION(target, source, env, for_signature): + def strip(f): + return strip_build_path(str(f), env) + if len(source) > 0: + srcs = map(strip, source) + else: + srcs = [''] + tgts = map(strip, target) + base = '' + com_pfx_len = 0 + # surprisingly, os.path.commonprefix is a dumb char-by-char string + # operation that has nothing to do with paths. + com_pfx = os.path.commonprefix(srcs + tgts) + if com_pfx: + if com_pfx[-1] == ".": + # change 'foo.: cc -> o' to 'foo: .cc -> .o' + com_pfx = com_pfx[0:-1] + elif not (com_pfx[-1] == "/" or + len(srcs[0]) == len(com_pfx) or + (len(srcs[0]) > len(com_pfx) and + srcs[0][len(com_pfx)] == ".")): + # if the common prefix doesn't factor out a complete + # directory path, the entire source file name, or + # everything through the source extension, then it's + # probably a fluke and we want to ignore it + com_pfx = '' + if com_pfx: + base += com_pfx + ': ' + com_pfx_len = len(com_pfx) + def fmt(files): + f = map(lambda s: s[com_pfx_len:], files) + return ', '.join(f) + return base + "%s -> %s" % (fmt(srcs), fmt(tgts)) -def _STRIP_TARGET(target, source, env, for_signature): - return _STRIP(target[0], env) -main['STRIP_TARGET'] = _STRIP_TARGET +# Like _TRANSFORMATION, but only display the first source in the +# sources list. (For isa_parser.py, where the first source is a file +# but the other sources are CPU models.) +def _TRANSFORM_1SRC(target, source, env, for_signature): + return _TRANSFORMATION(target, [source[0]], env, for_signature) + +# Like _TRANSFORMATION, but ignore sources (used where they are +# uniniteresting, hard to print, or too numerous to display). +def _TRANSFORM_NOSRC(target, source, env, for_signature): + return _TRANSFORMATION(target, [], env, for_signature) + +main['TRANSFORMATION'] = _TRANSFORMATION +main['TRANSFORM_1SRC'] = _TRANSFORM_1SRC +main['TRANSFORM_NOSRC'] = _TRANSFORM_NOSRC if main['VERBOSE']: def MakeAction(action, string, *args, **kwargs): return Action(action, *args, **kwargs) else: MakeAction = Action - main['CCCOMSTR'] = ' [ CC] $STRIP_SOURCE' - main['CXXCOMSTR'] = ' [ CXX] $STRIP_SOURCE' - main['ASCOMSTR'] = ' [ AS] $STRIP_SOURCE' - main['SWIGCOMSTR'] = ' [ SWIG] $STRIP_SOURCE' - main['ARCOMSTR'] = ' [ AR] $STRIP_TARGET' - main['LINKCOMSTR'] = ' [ LINK] $STRIP_TARGET' - main['RANLIBCOMSTR'] = ' [ RANLIB] $STRIP_TARGET' - main['M4COMSTR'] = ' [ M4] $STRIP_TARGET' - main['SHCCCOMSTR'] = ' [ SHCC] $STRIP_TARGET' - main['SHCXXCOMSTR'] = ' [ SHCXX] $STRIP_TARGET' + main['CCCOMSTR'] = ' [ CC] $TRANSFORMATION' + main['CXXCOMSTR'] = ' [ CXX] $TRANSFORMATION' + main['ASCOMSTR'] = ' [ AS] $TRANSFORMATION' + main['SWIGCOMSTR'] = ' [ SWIG] $TRANSFORMATION' + main['ARCOMSTR'] = ' [ AR] $TRANSFORM_NOSRC' + main['LINKCOMSTR'] = ' [ LINK] $TRANSFORM_NOSRC' + main['RANLIBCOMSTR'] = ' [ RANLIB] $TRANSFORM_NOSRC' + main['M4COMSTR'] = ' [ M4] $TRANSFORMATION' + main['SHCCCOMSTR'] = ' [ SHCC] $TRANSFORMATION' + main['SHCXXCOMSTR'] = ' [ SHCXX] $TRANSFORMATION' Export('MakeAction') CXX_version = readCommand([main['CXX'],'--version'], exception=False) @@ -828,7 +872,7 @@ # action depends on; when env['ALL_ISA_LIST'] changes these actions # should get re-executed. switch_hdr_action = MakeAction(gen_switch_hdr, - " [GENERATE] $STRIP_TARGET", varlist=['ALL_ISA_LIST']) + " [GENERATE] $TRANSFORMATION", varlist=['ALL_ISA_LIST']) # Instantiate actions for each header for hdr in switch_headers: diff -r 7338bc628489 -r 7beb0e825ec3 src/SConscript --- a/src/SConscript Mon Jan 03 14:35:47 2011 -0800 +++ b/src/SConscript Mon Jan 03 16:09:45 2011 -0800 @@ -290,7 +290,7 @@ code.write(str(target[0])) env.Command('config/the_isa.hh', map(Value, all_isa_list), - MakeAction(makeTheISA, " [ CFG ISA] $STRIP_TARGET")) + MakeAction(makeTheISA, " [ CFG ISA] $TRANSFORMATION")) ######################################################################## # @@ -433,7 +433,7 @@ defines_info = [ Value(build_env), Value(env['HG_INFO']) ] # Generate a file with all of the compile options in it env.Command('python/m5/defines.py', defines_info, - MakeAction(makeDefinesPyFile, " [ DEFINES] $STRIP_TARGET")) + MakeAction(makeDefinesPyFile, " [ DEFINES] $TRANSFORM_NOSRC")) PySource('m5', 'python/m5/defines.py') # Generate python file containing info about the M5 source code @@ -447,7 +447,7 @@ # Generate a file that wraps the basic top level files env.Command('python/m5/info.py', [ '#/AUTHORS', '#/LICENSE', '#/README', '#/RELEASE_NOTES' ], - MakeAction(makeInfoPyFile, " [ INFO] $STRIP_TARGET")) + MakeAction(makeInfoPyFile, " [ INFO] $TRANSFORMATION")) PySource('m5', 'python/m5/info.py') ######################################################################## @@ -523,7 +523,7 @@ hh_file = File('params/%s.hh' % name) params_hh_files.append(hh_file) env.Command(hh_file, Value(name), - MakeAction(createSimObjectParam, " [SO PARAM] $STRIP_TARGET")) + MakeAction(createSimObjectParam, " [SO PARAM] $TRANSFORMATION")) env.Depends(hh_file, depends + extra_deps) # Generate any parameter header files needed @@ -532,7 +532,7 @@ i_file = File('python/m5/internal/%s_%s.i' % (param.file_ext, name)) params_i_files.append(i_file) env.Command(i_file, Value(name), - MakeAction(createSwigParam, " [SW PARAM] $STRIP_TARGET")) + MakeAction(createSwigParam, " [SW PARAM] $TRANSFORMATION")) env.Depends(i_file, depends) SwigSource('m5.internal', i_file) @@ -543,18 +543,18 @@ cc_file = File('enums/%s.cc' % name) env.Command(cc_file, Value(name), - MakeAction(createEnumStrings, " [ENUM STR] $STRIP_TARGET")) + MakeAction(createEnumStrings, " [ENUM STR] $TRANSFORMATION")) env.Depends(cc_file, depends + extra_deps) Source(cc_file) hh_file = File('enums/%s.hh' % name) env.Command(hh_file, Value(name), - MakeAction(createEnumParam, " [EN PARAM] $STRIP_TARGET")) + MakeAction(createEnumParam, " [EN PARAM] $TRANSFORMATION")) env.Depends(hh_file, depends + extra_deps) i_file = File('python/m5/internal/enum_%s.i' % name) env.Command(i_file, Value(name), - MakeAction(createEnumSwig, " [ENUMSWIG] $STRIP_TARGET")) + MakeAction(createEnumSwig, " [ENUMSWIG] $TRANSFORMATION")) env.Depends(i_file, depends + extra_deps) SwigSource('m5.internal', i_file) @@ -594,7 +594,7 @@ for name in sim_objects.iterkeys(): params_file = File('python/m5/internal/param_%s.i' % name) env.Command(params_file, Value(name), - MakeAction(buildParam, " [BLDPARAM] $STRIP_TARGET")) + MakeAction(buildParam, " [BLDPARAM] $TRANSFORMATION")) env.Depends(params_file, depends) SwigSource('m5.internal', params_file) @@ -617,10 +617,10 @@ for swig in SwigSource.all: env.Command([swig.cc_source.tnode, swig.py_source.tnode], swig.tnode, MakeAction('$SWIG $SWIGFLAGS -outdir ${TARGETS[1].dir} ' - '-o ${TARGETS[0]} $SOURCES', " [ SWIG] $STRIP_TARGET")) + '-o ${TARGETS[0]} $SOURCES', " [ SWIG] $TRANSFORMATION")) init_file = 'python/swig/init_%s.cc' % swig.module env.Command(init_file, Value(swig.module), - MakeAction(makeEmbeddedSwigInit, " [EMBED SW] $STRIP_TARGET")) + MakeAction(makeEmbeddedSwigInit, " [EMBED SW] $TRANSFORMATION")) Source(init_file) def getFlags(source_flags): @@ -844,13 +844,13 @@ flags = map(Value, trace_flags.values()) env.Command('base/traceflags.py', flags, - MakeAction(traceFlagsPy, " [ TRACING] $STRIP_TARGET")) + MakeAction(traceFlagsPy, " [ TRACING] $TRANSFORM_NOSRC")) PySource('m5', 'base/traceflags.py') env.Command('base/traceflags.hh', flags, - MakeAction(traceFlagsHH, " [ TRACING] $STRIP_TARGET")) + MakeAction(traceFlagsHH, " [ TRACING] $TRANSFORM_NOSRC")) env.Command('base/traceflags.cc', flags, - MakeAction(traceFlagsCC, " [ TRACING] $STRIP_TARGET")) + MakeAction(traceFlagsCC, " [ TRACING] $TRANSFORM_NOSRC")) Source('base/traceflags.cc') # Embed python files. All .py files that have been indicated by a @@ -908,7 +908,7 @@ for source in PySource.all: env.Command(source.cpp, source.tnode, - MakeAction(embedPyFile, " [EMBED PY] $STRIP_TARGET")) + MakeAction(embedPyFile, " [EMBED PY] $TRANSFORMATION")) Source(source.cpp) ######################################################################## @@ -1000,7 +1000,7 @@ else: cmd = 'strip $SOURCE -o $TARGET' targets = new_env.Command(exename, progname, - MakeAction(cmd, " [ STRIP] $STRIP_TARGET")) + MakeAction(cmd, " [ STRIP] $TRANSFORMATION")) new_env.M5Binary = targets[0] envList.append(new_env) diff -r 7338bc628489 -r 7beb0e825ec3 src/arch/SConscript --- a/src/arch/SConscript Mon Jan 03 14:35:47 2011 -0800 +++ b/src/arch/SConscript Mon Jan 03 16:09:45 2011 -0800 @@ -118,7 +118,7 @@ cpu_models = [CpuModel.dict[cpu] for cpu in models] parser = isa_parser.ISAParser(target[0].dir.abspath, cpu_models) parser.parse_isa_desc(source[0].abspath) -isa_desc_action = MakeAction(isa_desc_action_func, " [ISA DESC] $STRIP_SOURCE") +isa_desc_action = MakeAction(isa_desc_action_func, " [ISA DESC] $TRANSFORM_1SRC") # Also include the CheckerCPU as one of the models if it is being # enabled via command line. diff -r 7338bc628489 -r 7beb0e825ec3 src/arch/isa_parser.py --- a/src/arch/isa_parser.py Mon Jan 03 14:35:47 2011 -0800 +++ b/src/arch/isa_parser.py Mon Jan 03 16:09:45 2011 -0800 @@ -1980,13 +1980,11 @@ old_contents = f.read() f.close() if contents != old_contents: - print 'Updating', file os.remove(file) # in case it's write-protected update = True else: print 'File', file, 'is unchanged' else: - print ' [GENERATE]', file update = True if update: f = open(file, 'w')