# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1327576956 -3600
# Node ID 4aacce9c9cb99f2fa2ce8f21ed64149d27550604
# Parent  60c48d99c28bbe91783a9991e06a6f7102318af9
Add posibility to give arguments for a SPECjvm2008 run

diff -r 60c48d99c28b -r 4aacce9c9cb9 mx/commands.py
--- a/mx/commands.py	Thu Jan 26 12:17:11 2012 +0100
+++ b/mx/commands.py	Thu Jan 26 12:22:36 2012 +0100
@@ -542,7 +542,7 @@
         benchmarks += sanitycheck.getBootstraps()
     #SPECjvm2008
     if ('specjvm2008' in args or 'all' in args):
-        benchmarks += [sanitycheck.getSPECjvm2008(True, 120, 120)]
+        benchmarks += [sanitycheck.getSPECjvm2008(None, True, 120, 120)]
     
     for test in benchmarks:
         if not results.has_key(test.group):
@@ -554,7 +554,9 @@
             f.write(json.dumps(results))
     
 def specjvm2008(args):
-    sanitycheck.getSPECjvm2008().bench('-graal')
+    benchArgs = [a[1:] for a in args if a[0] == '@']
+    vmArgs = [a for a in args if a[0] != '@']
+    sanitycheck.getSPECjvm2008(benchArgs).bench('-graal', opts=vmArgs)
     
 def mx_init():
     _vmbuild = 'product'
diff -r 60c48d99c28b -r 4aacce9c9cb9 mx/sanitycheck.py
--- a/mx/sanitycheck.py	Thu Jan 26 12:17:11 2012 +0100
+++ b/mx/sanitycheck.py	Thu Jan 26 12:22:36 2012 +0100
@@ -67,7 +67,7 @@
 class SanityCheckLevel:
     Fast, Gate, Normal, Extensive, Benchmark = range(5)
     
-def getSPECjvm2008(skipKitValidation=False, warmupTime=None, iterationTime=None):
+def getSPECjvm2008(benchArgs = None, skipKitValidation=False, warmupTime=None, iterationTime=None):
     
     specjvm2008 = mx.get_env('SPECJVM2008')
     if specjvm2008 is None or not exists(join(specjvm2008, 'SPECjvm2008.jar')):
@@ -87,7 +87,7 @@
     if skipKitValidation:
         opts += ['-ikv']
     
-    return Test("SPECjvm2008", "SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts, [success], [error], [matcher], vmOpts=['-Xms3g'], defaultCwd=specjvm2008)
+    return Test("SPECjvm2008", "SPECjvm2008", ['-jar', 'SPECjvm2008.jar'] + opts + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g'], defaultCwd=specjvm2008)
 
 def getDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]):
     checks = []