summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2007-11-15 12:58:06 -0500
committerAli Saidi <saidi@eecs.umich.edu>2007-11-15 12:58:06 -0500
commit0896b5b8974a79afd98ef08f69d21626ef9adf21 (patch)
tree190ee95216e89eab76bb936298bc0655f09ad0ac
parent185f0eb1344d51fd866bdfff383b907f3b53ec62 (diff)
downloadgem5-0896b5b8974a79afd98ef08f69d21626ef9adf21.tar.xz
Configs: Fix for benchmarks that don't use getopt.
--HG-- extra : convert_revision : 6cbc7bb360c282821dd9da7814e0ac8b689f5d01
-rw-r--r--configs/splash2/run.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/configs/splash2/run.py b/configs/splash2/run.py
index 6f8bf81a0..afa85a8f1 100644
--- a/configs/splash2/run.py
+++ b/configs/splash2/run.py
@@ -78,7 +78,7 @@ if not options.numcpus:
class Cholesky(LiveProcess):
cwd = options.rootdir + '/kernels/cholesky'
executable = options.rootdir + '/kernels/cholesky/CHOLESKY'
- cmd = ['CHOLESKY', '-p', str(options.numcpus),
+ cmd = ['CHOLESKY', '-p' + str(options.numcpus),
options.rootdir + '/kernels/cholesky/inputs/tk23.O']
class FFT(LiveProcess):
@@ -128,7 +128,7 @@ class Ocean_noncontig(LiveProcess):
class Raytrace(LiveProcess):
executable = options.rootdir + '/apps/raytrace/RAYTRACE'
- cmd = ['RAYTRACE', '-p', str(options.numcpus),
+ cmd = ['RAYTRACE', '-p' + str(options.numcpus),
options.rootdir + '/apps/raytrace/inputs/teapot.env']
cwd = options.rootdir + '/apps/raytrace'
@@ -252,10 +252,10 @@ elif options.benchmark == 'WaterNSquared':
elif options.benchmark == 'WaterSpatial':
root.workload = Water_spatial()
else:
- panic("The --benchmark environment variable was set to something" \
- +" improper.\nUse Cholesky, FFT, LUContig, LUNoncontig, Radix" \
- +", Barnes, FMM, OceanContig,\nOceanNoncontig, Raytrace," \
- +" WaterNSquared, or WaterSpatial\n")
+ print >> sys.stderr, """The --benchmark environment variable was set to something improper.
+Use Cholesky, FFT, LUContig, LUNoncontig, Radix, Barnes, FMM, OceanContig,
+OceanNoncontig, Raytrace, WaterNSquared, or WaterSpatial"""
+ sys.exit(1)
# --------------------
# Assign the workload to the cpus