From c47804002aa8ae456ac95b8ee7be06cc56ca1b34 Mon Sep 17 00:00:00 2001 From: Ron Dreslinski Date: Mon, 23 Apr 2007 16:03:53 -0400 Subject: [PATCH] Fix the splash2 run script --HG-- extra : convert_revision : 2b5f6718ac93d3d1b9b1d1b290f1ff5fa10cd0d8 --- configs/splash2/run.py | 80 ++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/configs/splash2/run.py b/configs/splash2/run.py index b162e0cc7..d051f1f1b 100644 --- a/configs/splash2/run.py +++ b/configs/splash2/run.py @@ -1,4 +1,4 @@ -# Copyright (c) 2005-2006 The Regents of The University of Michigan +# Copyright (c) 2005-2007 The Regents of The University of Michigan # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -60,7 +60,7 @@ parser.add_option("--l2size", parser.add_option("--l2latency", default = 10) parser.add_option("--rootdir", - help="ROot directory of Splash2", + help="Root directory of Splash2", default="/dist/splash2/codes") parser.add_option("-b", "--benchmark", help="Splash 2 benchmark to run") @@ -79,59 +79,79 @@ if not options.numcpus: # 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' + cwd = options.rootdir + '/kernels/cholesky' + 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' + cwd = options.rootdir + '/kernels/fft' + 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) + executable = options.rootdir + '/kernels/lu/contiguous_blocks/LU' + cmd = 'LU -p' + str(options.numcpus) + cwd = options.rootdir + '/kernels/lu/contiguous_blocks' class LU_noncontig(LiveProcess): - executable = options.rootdir + '/kernels/lu/non_contiguous_blocks/LU' - cmd = 'LU -p' + str(options.numcpus) + executable = options.rootdir + '/kernels/lu/non_contiguous_blocks/LU' + cmd = 'LU -p' + str(options.numcpus) + cwd = options.rootdir + '/kernels/lu/non_contiguous_blocks' class Radix(LiveProcess): - executable = options.rootdir + '/kernels/radix/RADIX' - cmd = 'RADIX -n524288 -p' + str(options.numcpus) + executable = options.rootdir + '/kernels/radix/RADIX' + cmd = 'RADIX -n524288 -p' + str(options.numcpus) + cwd = options.rootdir + '/kernels/radix' class Barnes(LiveProcess): - executable = options.rootdir + '/apps/barnes/BARNES' - cmd = 'BARNES' - input = options.rootdir + '/apps/barnes/input.p' + str(options.numcpus) + executable = options.rootdir + '/apps/barnes/BARNES' + cmd = 'BARNES' + input = options.rootdir + '/apps/barnes/input.p' + str(options.numcpus) + cwd = options.rootdir + '/apps/barnes' class FMM(LiveProcess): - executable = options.rootdir + '/apps/fmm/FMM' - cmd = 'FMM' + executable = options.rootdir + '/apps/fmm/FMM' + cmd = 'FMM' + if str(options.numcpus) == '1': + input = options.rootdir + '/apps/fmm/inputs/input.2048' + else: input = options.rootdir + '/apps/fmm/inputs/input.2048.p' + str(options.numcpus) + cwd = options.rootdir + '/apps/fmm' class Ocean_contig(LiveProcess): - executable = options.rootdir + '/apps/ocean/contiguous_partitions/OCEAN' - cmd = 'OCEAN -p' + str(options.numcpus) + executable = options.rootdir + '/apps/ocean/contiguous_partitions/OCEAN' + cmd = 'OCEAN -p' + str(options.numcpus) + cwd = options.rootdir + '/apps/ocean/contiguous_partitions' class Ocean_noncontig(LiveProcess): - executable = options.rootdir + '/apps/ocean/non_contiguous_partitions/OCEAN' - cmd = 'OCEAN -p' + str(options.numcpus) + executable = options.rootdir + '/apps/ocean/non_contiguous_partitions/OCEAN' + cmd = 'OCEAN -p' + str(options.numcpus) + cwd = options.rootdir + '/apps/ocean/non_contiguous_partitions' class Raytrace(LiveProcess): - executable = options.rootdir + '/apps/raytrace/RAYTRACE' - cmd = 'RAYTRACE -p' + str(options.numcpus) + ' ' \ - + options.rootdir + 'apps/raytrace/inputs/teapot.env' + executable = options.rootdir + '/apps/raytrace/RAYTRACE' + cmd = 'RAYTRACE -p' + str(options.numcpus) + ' ' \ + + options.rootdir + '/apps/raytrace/inputs/teapot.env' + cwd = options.rootdir + '/apps/raytrace' class Water_nsquared(LiveProcess): - executable = options.rootdir + '/apps/water-nsquared/WATER-NSQUARED' - cmd = 'WATER-NSQUARED' + executable = options.rootdir + '/apps/water-nsquared/WATER-NSQUARED' + cmd = 'WATER-NSQUARED' + if options.numcpus==1: + input = options.rootdir + '/apps/water-nsquared/input' + else: input = options.rootdir + '/apps/water-nsquared/input.p' + str(options.numcpus) + cwd = options.rootdir + '/apps/water-nsquared' class Water_spatial(LiveProcess): - executable = options.rootdir + '/apps/water-spatial/WATER-SPATIAL' - cmd = 'WATER-SPATIAL' + executable = options.rootdir + '/apps/water-spatial/WATER-SPATIAL' + cmd = 'WATER-SPATIAL' + if options.numcpus==1: + input = options.rootdir + '/apps/water-spatial/input' + else: input = options.rootdir + '/apps/water-spatial/input.p' + str(options.numcpus) - + cwd = options.rootdir + '/apps/water-spatial' # -------------------- # Base L1 Cache Definition