# HG changeset patch
# User Doug Simon <doug.simon@oracle.com>
# Date 1359582291 -3600
# Node ID 6078d41cecb29835afb24ef2a5ab88e4db35cede
# Parent  2025455e7d806c00dce34052b9120de13d872a44# Parent  dea5423a9479e845a70e273f29f4d6b4cddb4eac
Merge.

diff -r 2025455e7d80 -r 6078d41cecb2 mx/commands.py
--- a/mx/commands.py	Wed Jan 30 22:39:51 2013 +0100
+++ b/mx/commands.py	Wed Jan 30 22:44:51 2013 +0100
@@ -965,6 +965,9 @@
             
     if ('specjbb2005' in args or 'all' in args):
         benchmarks += [sanitycheck.getSPECjbb2005()]
+        
+    if ('specjbb2013' in args or 'all' in args):
+        benchmarks += [sanitycheck.getSPECjbb2013()]
 
     for test in benchmarks:
         for (groupName, res) in test.bench(vm).items():
diff -r 2025455e7d80 -r 6078d41cecb2 mx/sanitycheck.py
--- a/mx/sanitycheck.py	Wed Jan 30 22:39:51 2013 +0100
+++ b/mx/sanitycheck.py	Wed Jan 30 22:44:51 2013 +0100
@@ -107,6 +107,19 @@
     matcher = ValuesMatcher(score, {'group' : 'SPECjbb2005', 'name' : 'score', 'score' : '<score>'})
     classpath = ['jbb.jar', 'check.jar']
     return Test("SPECjbb2005", ['spec.jbb.JBBmain', '-propfile', 'SPECjbb.props'] + benchArgs, [success], [error], [matcher], vmOpts=['-Xms3g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops', '-cp', os.pathsep.join(classpath)], defaultCwd=specjbb2005)
+
+def getSPECjbb2013(benchArgs = []):
+    
+    specjbb2013 = mx.get_env('SPECJBB2013')
+    if specjbb2013 is None or not exists(join(specjbb2013, 'specjbb2013.jar')):
+        mx.abort('Please set the SPECJBB2013 environment variable to a SPECjbb2013 directory')
+    
+    jops = re.compile(r"^RUN RESULT: hbIR \(max attempted\) = [0-9]+, hbIR \(settled\) = [0-9]+, max-jOPS = (?P<max>[0-9]+), critical-jOPS = (?P<critical>[0-9]+)$", re.MULTILINE)
+    #error?
+    success = re.compile(r"org.spec.jbb.controller: Run finished", re.MULTILINE)
+    matcherMax = ValuesMatcher(jops, {'group' : 'SPECjbb2013', 'name' : 'max', 'score' : '<max>'})
+    matcherCritical = ValuesMatcher(jops, {'group' : 'SPECjbb2013', 'name' : 'critical', 'score' : '<critical>'})
+    return Test("SPECjbb2013", ['-jar', 'specjbb2013.jar', '-m', 'composite'] + benchArgs, [success], [], [matcherCritical, matcherMax], vmOpts=['-Xms7g', '-XX:+UseSerialGC', '-XX:-UseCompressedOops', '-XX:CompileCommand=exclude,*.FastMath::slowLog'], defaultCwd=specjbb2013)
     
 def getSPECjvm2008(benchArgs = [], skipCheck=False, skipKitValidation=False, warmupTime=None, iterationTime=None):