Merge zizzer:/bk/newmem
into zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmemcleanest --HG-- extra : convert_revision : 4678ce5fb0dc29a28d9cd21e687f9cee967d21fa
This commit is contained in:
Ron Dreslinski
commit
e855a7e6f2
1 changed files with 223 additions and 43 deletions
|
|
@ -1,4 +1,4 @@
|
||||||
# Copyright (c) 2005 The Regents of The University of Michigan
|
# Copyright (c) 2005-2006 The Regents of The University of Michigan
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
|
|
@ -26,54 +26,234 @@
|
||||||
#
|
#
|
||||||
# Authors: Ron Dreslinski
|
# Authors: Ron Dreslinski
|
||||||
|
|
||||||
from m5 import *
|
# Splash2 Run Script
|
||||||
import Splash2
|
#
|
||||||
|
|
||||||
if 'SYSTEM' not in env:
|
import m5
|
||||||
panic("The SYSTEM environment variable must be set!\ne.g -ESYSTEM=Detailed\n")
|
from m5.objects import *
|
||||||
|
import os, optparse, sys
|
||||||
|
m5.AddToPath('../common')
|
||||||
|
|
||||||
if env['SYSTEM'] == 'Simple':
|
# --------------------
|
||||||
from SimpleConfig import *
|
# Define Command Line Options
|
||||||
BaseCPU.workload = Parent.workload
|
# ====================
|
||||||
SimpleStandAlone.cpu = [ CPU() for i in xrange(int(env['NP'])) ]
|
|
||||||
root = SimpleStandAlone()
|
parser = optparse.OptionParser()
|
||||||
elif env['SYSTEM'] == 'Detailed':
|
|
||||||
from DetailedConfig import *
|
parser.add_option("-d", "--detailed", action="store_true")
|
||||||
BaseCPU.workload = Parent.workload
|
parser.add_option("-t", "--timing", action="store_true")
|
||||||
DetailedStandAlone.cpu = [ DetailedCPU() for i in xrange(int(env['NP'])) ]
|
parser.add_option("-m", "--maxtick", type="int")
|
||||||
root = DetailedStandAlone()
|
parser.add_option("-n", "--numcpus",
|
||||||
|
help="Number of cpus in total", type="int")
|
||||||
|
parser.add_option("-f", "--frequency",
|
||||||
|
help="Frequency of each CPU")
|
||||||
|
parser.add_option("-p", "--protocol",
|
||||||
|
default="moesi",
|
||||||
|
help="The coherence protocol to use for the L1'a (i.e. MOESI, MOSI)")
|
||||||
|
parser.add_option("--l1size")
|
||||||
|
parser.add_option("--l1latency")
|
||||||
|
parser.add_option("--l2size")
|
||||||
|
parser.add_option("--l2latency")
|
||||||
|
parser.add_option("--rootdir",
|
||||||
|
help="ROot directory of Splash2",
|
||||||
|
default="../../Splash2/codes")
|
||||||
|
parser.add_option("-b", "--benchmark",
|
||||||
|
help="Splash 2 benchmark to run")
|
||||||
|
|
||||||
|
(options, args) = parser.parse_args()
|
||||||
|
|
||||||
|
if args:
|
||||||
|
print "Error: script doesn't take any positional arguments"
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
# --------------------
|
||||||
|
# Define Splash2 Benchmarks
|
||||||
|
# ====================
|
||||||
|
class Cholesky(LiveProcess):
|
||||||
|
executable = options.rootdir + '/kernels/cholesky/CHOLESKY'
|
||||||
|
cmd = 'CHOLESKY -p' + str(options.numcpus) + ' '\
|
||||||
|
+ options.rootdir + '/kernels/cholesky/inputs/tk23.O'
|
||||||
|
|
||||||
|
class FFT(LiveProcess):
|
||||||
|
executable = options.rootdir + 'kernels/fft/FFT'
|
||||||
|
cmd = 'FFT -p' + str(options.numcpus) + ' -m18'
|
||||||
|
|
||||||
|
class LU_contig(LiveProcess):
|
||||||
|
executable = options.rootdir + 'kernels/lu/contiguous_blocks/LU'
|
||||||
|
cmd = 'LU -p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class LU_noncontig(LiveProcess):
|
||||||
|
executable = options.rootdir + 'kernels/lu/non_contiguous_blocks/LU'
|
||||||
|
cmd = 'LU -p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class Radix(LiveProcess):
|
||||||
|
executable = options.rootdir + 'kernels/radix/RADIX'
|
||||||
|
cmd = 'RADIX -n524288 -p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class Barnes(LiveProcess):
|
||||||
|
executable = options.rootdir + 'apps/barnes/BARNES'
|
||||||
|
cmd = 'BARNES'
|
||||||
|
input = options.rootdir + 'apps/barnes/input.p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class FMM(LiveProcess):
|
||||||
|
executable = options.rootdir + 'apps/fmm/FMM'
|
||||||
|
cmd = 'FMM'
|
||||||
|
input = options.rootdir + 'apps/fmm/inputs/input.2048.p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class Ocean_contig(LiveProcess):
|
||||||
|
executable = options.rootdir + 'apps/ocean/contiguous_partitions/OCEAN'
|
||||||
|
cmd = 'OCEAN -p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class Ocean_noncontig(LiveProcess):
|
||||||
|
executable = options.rootdir + 'apps/ocean/non_contiguous_partitions/OCEAN'
|
||||||
|
cmd = 'OCEAN -p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class Raytrace(LiveProcess):
|
||||||
|
executable = options.rootdir + 'apps/raytrace/RAYTRACE'
|
||||||
|
cmd = 'RAYTRACE -p' + str(options.numcpus) + ' ' \
|
||||||
|
+ options.rootdir + 'apps/raytrace/inputs/teapot.env'
|
||||||
|
|
||||||
|
class Water_nsquared(LiveProcess):
|
||||||
|
executable = options.rootdir + 'apps/water-nsquared/WATER-NSQUARED'
|
||||||
|
cmd = 'WATER-NSQUARED'
|
||||||
|
input = options.rootdir + 'apps/water-nsquared/input.p' + str(options.numcpus)
|
||||||
|
|
||||||
|
class Water_spatial(LiveProcess):
|
||||||
|
executable = options.rootdir + 'apps/water-spatial/WATER-SPATIAL'
|
||||||
|
cmd = 'WATER-SPATIAL'
|
||||||
|
input = options.rootdir + 'apps/water-spatial/input.p' + str(options.numcpus)
|
||||||
|
|
||||||
|
|
||||||
|
# --------------------
|
||||||
|
# Base L1 Cache Definition
|
||||||
|
# ====================
|
||||||
|
|
||||||
|
class L1(BaseCache):
|
||||||
|
latency = options.l1latency
|
||||||
|
block_size = 64
|
||||||
|
mshrs = 12
|
||||||
|
tgts_per_mshr = 8
|
||||||
|
protocol = CoherenceProtocol(protocol=options.protocol)
|
||||||
|
|
||||||
|
# ----------------------
|
||||||
|
# Base L2 Cache Definition
|
||||||
|
# ----------------------
|
||||||
|
|
||||||
|
class L2(BaseCache):
|
||||||
|
block_size = 64
|
||||||
|
latency = options.l2latency
|
||||||
|
mshrs = 92
|
||||||
|
tgts_per_mshr = 16
|
||||||
|
write_buffers = 8
|
||||||
|
|
||||||
|
# ----------------------
|
||||||
|
# Define the cpus
|
||||||
|
# ----------------------
|
||||||
|
|
||||||
|
busFrequency = Frequency(options.frequency)
|
||||||
|
|
||||||
|
if options.timing:
|
||||||
|
cpus = [TimingSimpleCPU(cpu_id = i,
|
||||||
|
clock=options.frequency)
|
||||||
|
for i in xrange(options.numcpus)]
|
||||||
|
elif options.detailed:
|
||||||
|
cpus = [DerivO3CPU(cpu_id = i,
|
||||||
|
clock=options.frequency)
|
||||||
|
for i in xrange(options.numcpus)]
|
||||||
else:
|
else:
|
||||||
panic("The SYSTEM environment variable was set to something improper.\n Use Simple or Detailed\n")
|
cpus = [AtomicSimpleCPU(cpu_id = i,
|
||||||
|
clock=options.frequency)
|
||||||
|
for i in xrange(options.numcpus)]
|
||||||
|
|
||||||
if 'BENCHMARK' not in env:
|
# ----------------------
|
||||||
panic("The BENCHMARK environment variable must be set!\ne.g. -EBENCHMARK=Cholesky\n")
|
# Create a system, and add system wide objects
|
||||||
|
# ----------------------
|
||||||
|
system = System(cpu = cpus, physmem = PhysicalMemory(),
|
||||||
|
membus = Bus(clock = busFrequency))
|
||||||
|
|
||||||
if env['BENCHMARK'] == 'Cholesky':
|
system.toL2bus = Bus(clock = busFrequency)
|
||||||
root.workload = Splash2.Cholesky()
|
system.l2 = L2(size = options.l2size, assoc = 8)
|
||||||
elif env['BENCHMARK'] == 'FFT':
|
|
||||||
root.workload = Splash2.FFT()
|
# ----------------------
|
||||||
elif env['BENCHMARK'] == 'LUContig':
|
# Connect the L2 cache and memory together
|
||||||
root.workload = Splash2.LU_contig()
|
# ----------------------
|
||||||
elif env['BENCHMARK'] == 'LUNoncontig':
|
|
||||||
root.workload = Splash2.LU_noncontig()
|
system.physmem.port = system.membus.port
|
||||||
elif env['BENCHMARK'] == 'Radix':
|
system.l2.cpu_side = system.toL2bus.port
|
||||||
root.workload = Splash2.Radix()
|
system.l2.mem_side = system.membus.port
|
||||||
elif env['BENCHMARK'] == 'Barnes':
|
|
||||||
root.workload = Splash2.Barnes()
|
# ----------------------
|
||||||
elif env['BENCHMARK'] == 'FMM':
|
# Connect the L2 cache and clusters together
|
||||||
root.workload = Splash2.FMM()
|
# ----------------------
|
||||||
elif env['BENCHMARK'] == 'OceanContig':
|
for cpu in cpus:
|
||||||
root.workload = Splash2.Ocean_contig()
|
cpu.addPrivateSplitL1Caches(L1(size = options.l1size, assoc = 1),
|
||||||
elif env['BENCHMARK'] == 'OceanNoncontig':
|
L1(size = options.l1size, assoc = 4))
|
||||||
root.workload = Splash2.Ocean_noncontig()
|
cpu.mem = cpu.dcache
|
||||||
elif env['BENCHMARK'] == 'Raytrace':
|
# connect cpu level-1 caches to shared level-2 cache
|
||||||
root.workload = Splash2.Raytrace()
|
cpu.connectMemPorts(system.toL2bus)
|
||||||
elif env['BENCHMARK'] == 'WaterNSquared':
|
|
||||||
root.workload = Splash2.Water_nsquared()
|
|
||||||
elif env['BENCHMARK'] == 'WaterSpatial':
|
# ----------------------
|
||||||
root.workload = Splash2.Water_spatial()
|
# Define the root
|
||||||
|
# ----------------------
|
||||||
|
|
||||||
|
root = Root(system = system)
|
||||||
|
|
||||||
|
# --------------------
|
||||||
|
# Pick the correct Splash2 Benchmarks
|
||||||
|
# ====================
|
||||||
|
if options.benchmark == 'Cholesky':
|
||||||
|
root.workload = Cholesky()
|
||||||
|
elif options.benchmark == 'FFT':
|
||||||
|
root.workload = FFT()
|
||||||
|
elif options.benchmark == 'LUContig':
|
||||||
|
root.workload = LU_contig()
|
||||||
|
elif options.benchmark == 'LUNoncontig':
|
||||||
|
root.workload = LU_noncontig()
|
||||||
|
elif options.benchmark == 'Radix':
|
||||||
|
root.workload = Radix()
|
||||||
|
elif options.benchmark == 'Barnes':
|
||||||
|
root.workload = Barnes()
|
||||||
|
elif options.benchmark == 'FMM':
|
||||||
|
root.workload = FMM()
|
||||||
|
elif options.benchmark == 'OceanContig':
|
||||||
|
root.workload = Ocean_contig()
|
||||||
|
elif options.benchmark == 'OceanNoncontig':
|
||||||
|
root.workload = Ocean_noncontig()
|
||||||
|
elif options.benchmark == 'Raytrace':
|
||||||
|
root.workload = Raytrace()
|
||||||
|
elif options.benchmark == 'WaterNSquared':
|
||||||
|
root.workload = Water_nsquared()
|
||||||
|
elif options.benchmark == 'WaterSpatial':
|
||||||
|
root.workload = Water_spatial()
|
||||||
else:
|
else:
|
||||||
panic("The BENCHMARK environment variable was set to something" \
|
panic("The --benchmark environment variable was set to something" \
|
||||||
+" improper.\nUse Cholesky, FFT, LUContig, LUNoncontig, Radix" \
|
+" improper.\nUse Cholesky, FFT, LUContig, LUNoncontig, Radix" \
|
||||||
+", Barnes, FMM, OceanContig,\nOceanNoncontig, Raytrace," \
|
+", Barnes, FMM, OceanContig,\nOceanNoncontig, Raytrace," \
|
||||||
+" WaterNSquared, or WaterSpatial\n")
|
+" WaterNSquared, or WaterSpatial\n")
|
||||||
|
|
||||||
|
# --------------------
|
||||||
|
# Assign the workload to the cpus
|
||||||
|
# ====================
|
||||||
|
|
||||||
|
for cpu in cpus:
|
||||||
|
cpu.workload = root.workload
|
||||||
|
|
||||||
|
# ----------------------
|
||||||
|
# Run the simulation
|
||||||
|
# ----------------------
|
||||||
|
|
||||||
|
if options.timing or options.detailed:
|
||||||
|
root.system.mem_mode = 'timing'
|
||||||
|
|
||||||
|
# instantiate configuration
|
||||||
|
m5.instantiate(root)
|
||||||
|
|
||||||
|
# simulate until program terminates
|
||||||
|
if options.maxtick:
|
||||||
|
exit_event = m5.simulate(options.maxtick)
|
||||||
|
else:
|
||||||
|
exit_event = m5.simulate()
|
||||||
|
|
||||||
|
print 'Exiting @ tick', m5.curTick(), 'because', exit_event.getCause()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue