sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem

Browse source 
into  zizzer.eecs.umich.edu:/.automount/wexford/x/gblack/m5/newmem-o3-spec

--HG--
extra : convert_revision : 26118d0dce464405148d2693fee4561fa0ce10ff
This commit is contained in:
Gabe Black 2007-04-18 21:27:37 -04:00
commit f3a0abbecc
3 changed files with 15 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/python/SConscript
View file

@ -103,7 +103,6 @@ SimObject('m5/objects/Process.py')
SimObject('m5/objects/Repl.py') SimObject('m5/objects/Repl.py')
SimObject('m5/objects/Root.py') SimObject('m5/objects/Root.py')
SimObject('m5/objects/Sampler.py') SimObject('m5/objects/Sampler.py')
SimObject('m5/objects/Scsi.py')
SimObject('m5/objects/SimConsole.py') SimObject('m5/objects/SimConsole.py')
SimObject('m5/objects/SimpleCPU.py') SimObject('m5/objects/SimpleCPU.py')
SimObject('m5/objects/SimpleDisk.py') SimObject('m5/objects/SimpleDisk.py')
@ -114,7 +113,3 @@ SimObject('m5/objects/T1000.py')
#SimObject('m5/objects/Tru64System.py') #SimObject('m5/objects/Tru64System.py')
SimObject('m5/objects/Tsunami.py') SimObject('m5/objects/Tsunami.py')
SimObject('m5/objects/Uart.py') SimObject('m5/objects/Uart.py')
if env['ALPHA_TLASER']:
SimObject('m5/objects/DmaEngine.py')
SimObject('m5/objects/Turbolaser.py')

3
src/sim/simulate.cc
View file

@ -92,10 +92,9 @@ simulate(Tick num_cycles)
if (async_event) { if (async_event) {
async_event = false; async_event = false;
if (async_statdump || async_statreset) { if (async_statdump || async_statreset) {
Stats::StatEvent(async_statdump, async_statreset);
async_statdump = false; async_statdump = false;
async_statreset = false; async_statreset = false;
Stats::StatEvent(async_statdump, async_statreset);
} }
if (async_exit) { if (async_exit) {

27
util/make_release.py
View file

@ -133,30 +133,23 @@ rmtree(release_dir, 'src/dev/i8*')
remove(release_dir, 'util/chgcopyright') remove(release_dir, 'util/chgcopyright')
remove(release_dir, 'util/make_release.py') remove(release_dir, 'util/make_release.py')
# fix up the SConscript to deal with files we've removed def remove_sources(regex, subdir):
mem_expr = re.compile('.*mem/cache/(tags/split|prefetch/(ghb|stride)).*') script = joinpath(release_dir, subdir, 'SConscript')
inscript = file(joinpath(release_dir, 'src', 'SConscript'), 'r').readlines() if isinstance(regex, str):
outscript = file(joinpath(release_dir, 'src', 'SConscript'), 'w') regex = re.compile(regex)
inscript = file(script, 'r').readlines()
outscript = file(script, 'w')
for line in inscript: for line in inscript:
if mem_expr.match(line): if regex.match(line):
continue continue
outscript.write(line) outscript.write(line)
outscript.close() outscript.close()
# fix up the SConscript to deal with files we've removed # fix up the SConscript to deal with files we've removed
mem_expr = re.compile('.*i8254xGBe.*') remove_sources(r'.*split.*\.cc', 'src/mem/cache/tags')
inscript = file(joinpath(release_dir, 'src', 'dev', 'SConscript'), 'r').readlines() remove_sources(r'.*(ghb|stride)_prefetcher\.cc', 'src/mem/cache/prefetch')
outscript = file(joinpath(release_dir, 'src', 'dev', 'SConscript'), 'w') remove_sources(r'.*i8254xGBe.*', 'src/dev')
for line in inscript:
if mem_expr.match(line):
continue
outscript.write(line)
outscript.close()
benches = [ 'bzip2', 'eon', 'gzip', 'mcf', 'parser', 'perlbmk', benches = [ 'bzip2', 'eon', 'gzip', 'mcf', 'parser', 'perlbmk',
'twolf', 'vortex' ] 'twolf', 'vortex' ]