Implement a single config file to encompass all of the SPEC

CPU2000 stuff, and use it in all of the tests that currently
use SPEC

--HG--
extra : convert_revision : 8cd26a597e51a90b6d2810d344a075f5aa0f011b

8 files changed, 40 insertions, 29 deletions

diff --git a/tests/long/00.gzip/test.py b/tests/long/00.gzip/test.py
index 5c33376bd..06ccb656b 100644
--- a/tests/long/00.gzip/test.py
+++ b/tests/long/00.gzip/test.py
@@ -26,6 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('gzip'))
-process.cmd = 'gzip ' + inputpath('gzip', 'smred.log') + ' 1'
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import gzip_log
+
+workload = gzip_log('alpha', 'tru64', 'smred')
+root.system.cpu.workload = workload.makeLiveProcess()
diff --git a/tests/long/10.mcf/test.py b/tests/long/10.mcf/test.py
index 36d077c96..f545aad3d 100644
--- a/tests/long/10.mcf/test.py
+++ b/tests/long/10.mcf/test.py
@@ -26,6 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('mcf'))
-process.cmd = 'mcf' + inputpath('mcf', 'lgred.in')
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import mcf
+
+workload = mcf('alpha', 'tru64', 'lgred')
+root.system.cpu.workload = workload.makeLiveProcess()
diff --git a/tests/long/20.parser/test.py b/tests/long/20.parser/test.py
index 760908722..8703ae634 100644
--- a/tests/long/20.parser/test.py
+++ b/tests/long/20.parser/test.py
@@ -26,7 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('parser'))
-process.cmd = 'parser 2.1.dict -batch'
-process.input = inputpath('parser', 'lgred.in')
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import parser
+
+workload = parser('alpha', 'tru64', 'lgred')
+root.system.cpu.workload = workload.makeLiveProcess()
diff --git a/tests/long/30.eon/test.py b/tests/long/30.eon/test.py
index d6bf3bb76..828b6390c 100644
--- a/tests/long/30.eon/test.py
+++ b/tests/long/30.eon/test.py
@@ -26,10 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('eon'))
-process.cmd = 'eon' + inputpath('eon', 'chair.control.cook') + \
-              inputpath('eon', 'chair.camera') + \
-              inputpath('eon', 'chair.surfaces') + \
-              inputpath('eon', 'chair.cook.ppm') + 'ppm' \
-              + 'pixels_out.cook'
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import eon_cook
+
+workload = eon_cook('alpha', 'tru64', 'mdred')
+root.system.cpu.workload = workload.makeLiveProcess()
diff --git a/tests/long/40.perlbmk/test.py b/tests/long/40.perlbmk/test.py
index 81c36bab3..2f9dd0ff0 100644
--- a/tests/long/40.perlbmk/test.py
+++ b/tests/long/40.perlbmk/test.py
@@ -26,6 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('perlbmk'))
-process.cmd = 'perlbmk -I./lib' + inputpath('perlbmk', 'lgred.makerand.pl')
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import perlbmk_makerand
+
+workload = perlbmk_makerand('alpha', 'tru64', 'lgred')
+root.system.cpu.workload = workload.makeLiveProcess()
diff --git a/tests/long/50.vortex/test.py b/tests/long/50.vortex/test.py
index f6d1e03df..bd57ef6e6 100644
--- a/tests/long/50.vortex/test.py
+++ b/tests/long/50.vortex/test.py
@@ -26,6 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('vortex'))
-process.cmd = 'vortex' + inputpath('smred.raw')
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import vortex
+
+workload = vortex('alpha', 'tru64', 'smred')
+root.system.cpu.workload = workload.makeLiveProcess()
diff --git a/tests/long/60.bzip2/test.py b/tests/long/60.bzip2/test.py
index e96d64656..362ca524e 100644
--- a/tests/long/60.bzip2/test.py
+++ b/tests/long/60.bzip2/test.py
@@ -26,6 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('bzip2'))
-process.cmd = cmd = 'bzip2' + inputpath('bzip2', 'lgred.source')
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import bzip2_source
+
+workload = bzip2_source('alpha', 'tru64', 'lgred')
+root.system.cpu.workload = workload.makeLiveProcess()
diff --git a/tests/long/70.twolf/test.py b/tests/long/70.twolf/test.py
index be7a04f97..c105a17e2 100644
--- a/tests/long/70.twolf/test.py
+++ b/tests/long/70.twolf/test.py
@@ -26,6 +26,8 @@
 #
 # Authors: Korey Sewell
 
-process = LiveProcess(executable = binpath('twolf'))
-process.cmd = 'twolf' + inputpath('twolf', 'smred/smred')
-root.system.cpu.workload = process
+m5.AddToPath('../configs/common')
+from cpu2000 import twolf
+
+workload = twolf('alpha', 'tru64', 'smred')
+root.system.cpu.workload = workload.makeLiveProcess()