diff mx.graal/sanitycheck.py @ 22952:1ba34f16d176

Factor out benchmarks from mx_graal_n.py and add specjbb2015
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Wed, 04 Nov 2015 11:05:27 -0800
parents 9fed99d7f32d
children
line wrap: on
line diff
--- a/mx.graal/sanitycheck.py	Thu Nov 05 18:26:45 2015 +0100
+++ b/mx.graal/sanitycheck.py	Wed Nov 04 11:05:27 2015 -0800
@@ -175,6 +175,21 @@
                 _noneAsEmptyList(benchArgs), [success], [], [matcherCritical, matcherMax],
                 vmOpts=['-Xmx6g', '-Xms6g', '-Xmn3g', '-XX:+UseParallelOldGC', '-XX:-UseAdaptiveSizePolicy', '-XX:-UseBiasedLocking', '-XX:-UseCompressedOops'], defaultCwd=specjbb2013)
 
+def getSPECjbb2015(benchArgs=None):
+
+    specjbb2015 = mx.get_env('SPECJBB2015')
+    if specjbb2015 is None or not exists(join(specjbb2015, 'specjbb2015.jar')):
+        mx.abort('Please set the SPECJBB2015 environment variable to a SPECjbb2015 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' : 'SPECjbb2015', 'name' : 'max', 'score' : '<max>'})
+    matcherCritical = ValuesMatcher(jops, {'group' : 'SPECjbb2015', 'name' : 'critical', 'score' : '<critical>'})
+    return Test("SPECjbb2015", ['-jar', 'specjbb2015.jar', '-m', 'composite'] +
+                _noneAsEmptyList(benchArgs), [success], [], [matcherCritical, matcherMax],
+                vmOpts=['-Xmx6g', '-Xms6g', '-Xmn3g', '-XX:+UseParallelOldGC', '-XX:-UseAdaptiveSizePolicy', '-XX:-UseBiasedLocking', '-XX:-UseCompressedOops'], defaultCwd=specjbb2015)
+
 def getSPECjvm2008(benchArgs=None):
 
     specjvm2008 = mx.get_env('SPECJVM2008')