# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1328700070 -3600
# Node ID 3f7fac1bf082459785d85f4dfaa6fe7cdb4a3b9b
# Parent  f14ac97af98f554226267a2a344e96211feb4b2c# Parent  43b4e9201c29a14f884696c475d9db064e77c2c6
Merge

diff -r f14ac97af98f -r 3f7fac1bf082 mx/commands.py
--- a/mx/commands.py	Tue Feb 07 23:30:08 2012 +0100
+++ b/mx/commands.py	Wed Feb 08 12:21:10 2012 +0100
@@ -653,9 +653,35 @@
             f.write(json.dumps(results))
     
 def specjvm2008(args):
-    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)
+    """run one or all SPECjvm2008 benchmarks
+    
+    All options begining with - will be passed to the vm except for -ikv -wt and -it.
+    Other options are supposed to be benchmark names and will be passed to SPECjvm2008."""
+    benchArgs = [a for a in args if a[0] != '-']
+    vmArgs = [a for a in args if a[0] == '-']
+    wt = None
+    it = None
+    skipValid = False
+    if '-ikv' in vmArgs:
+        skipValid = True
+        vmArgs.remove('-ikv')
+    if '-wt' in vmArgs:
+        wtIdx = args.index('-wt')
+        try:
+            wt = int(args[wtIdx+1])
+        except:
+            mx.abort('-wt (Warmup time) needs a numeric value (seconds)')
+        vmArgs.remove('-wt')
+        benchArgs.remove(args[wtIdx+1])
+    if '-it' in vmArgs:
+        itIdx = args.index('-it')
+        try:
+            it = int(args[itIdx+1])
+        except:
+            mx.abort('-it (Iteration time) needs a numeric value (seconds)')
+        vmArgs.remove('-it')
+        benchArgs.remove(args[itIdx+1])
+    sanitycheck.getSPECjvm2008(benchArgs, skipValid, wt, it).bench('graal', opts=vmArgs)
     
 def hsdis(args):
     """Installs the hsdis library