# HG changeset patch
# User Bernhard Urban <bernhard.urban@jku.at>
# Date 1396017850 -3600
# Node ID fdb912b1eb7bdfd85948262a3c11826e0d57ad74
# Parent  626b02830dfc60e7a795ae2547db58204e747237
gate: use no tiered to test bootstrap, add scaladacapo-kiama (fastdebug)

diff -r 626b02830dfc -r fdb912b1eb7b mx/mx_graal.py
--- a/mx/mx_graal.py	Fri Mar 28 15:38:14 2014 +0100
+++ b/mx/mx_graal.py	Fri Mar 28 15:44:10 2014 +0100
@@ -1001,34 +1001,34 @@
 
     with VM('graal', 'fastdebug'):
         t = Task('BootstrapWithSystemAssertions:fastdebug')
-        vm(['-esa', '-version'])
+        vm(['-esa', '-XX:-TieredCompilation', '-version'])
         tasks.append(t.stop())
 
     with VM('graal', 'fastdebug'):
-        t = Task('NoTieredBootstrapWithSystemAssertions:fastdebug')
-        vm(['-esa', '-XX:-TieredCompilation', '-version'])
+        t = Task('BootstrapWithSystemAssertionsNoCoop:fastdebug')
+        vm(['-esa', '-XX:-TieredCompilation', '-XX:-UseCompressedOops', '-version'])
         tasks.append(t.stop())
 
     with VM('graal', 'product'):
         t = Task('BootstrapWithGCVerification:product')
         out = mx.DuplicateSuppressingStream(['VerifyAfterGC:', 'VerifyBeforeGC:']).write
-        vm(['-XX:+UnlockDiagnosticVMOptions', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-version'], out=out)
+        vm(['-XX:-TieredCompilation', '-XX:+UnlockDiagnosticVMOptions', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-version'], out=out)
         tasks.append(t.stop())
 
     with VM('graal', 'product'):
         t = Task('BootstrapWithG1GCVerification:product')
         out = mx.DuplicateSuppressingStream(['VerifyAfterGC:', 'VerifyBeforeGC:']).write
-        vm(['-XX:+UnlockDiagnosticVMOptions', '-XX:-UseSerialGC', '-XX:+UseG1GC', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-version'], out=out)
+        vm(['-XX:-TieredCompilation', '-XX:+UnlockDiagnosticVMOptions', '-XX:-UseSerialGC', '-XX:+UseG1GC', '-XX:+VerifyBeforeGC', '-XX:+VerifyAfterGC', '-version'], out=out)
         tasks.append(t.stop())
 
     with VM('graal', 'product'):
         t = Task('BootstrapWithRegisterPressure:product')
-        vm(['-G:RegisterPressure=rbx,r11,r10,r14,xmm3,xmm11,xmm14', '-esa', '-version'])
+        vm(['-XX:-TieredCompilation', '-G:RegisterPressure=rbx,r11,r10,r14,xmm3,xmm11,xmm14', '-esa', '-version'])
         tasks.append(t.stop())
 
     with VM('graal', 'product'):
         t = Task('BootstrapWithImmutableCode:product')
-        vm(['-G:+ImmutableCode', '-G:+VerifyPhases', '-esa', '-version'])
+        vm(['-XX:-TieredCompilation', '-G:+ImmutableCode', '-G:+VerifyPhases', '-esa', '-version'])
         tasks.append(t.stop())
 
     with VM('server', 'product'):  # hosted mode
@@ -1037,11 +1037,7 @@
         tasks.append(t.stop())
 
     for vmbuild in ['fastdebug', 'product']:
-        for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
-            if 'eclipse' in str(test) and mx.java().version >= mx.VersionSpec('1.8'):
-                # DaCapo eclipse doesn't run under JDK8
-                continue
-
+        for test in sanitycheck.getDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild) + sanitycheck.getScalaDacapos(level=sanitycheck.SanityCheckLevel.Gate, gateBuildLevel=vmbuild):
             t = Task(str(test) + ':' + vmbuild)
             if not test.test('graal'):
                 t.abort(test.name + ' Failed')
diff -r 626b02830dfc -r fdb912b1eb7b mx/sanitycheck.py
--- a/mx/sanitycheck.py	Fri Mar 28 15:38:14 2014 +0100
+++ b/mx/sanitycheck.py	Fri Mar 28 15:44:10 2014 +0100
@@ -32,7 +32,7 @@
 dacapoSanityWarmup = {
     'avrora':     [0, 0, 3, 6, 13],
     'batik':      [0, 0, 5, 5, 20],
-    'eclipse':    [2, 4, 5, 10, 16],
+    'eclipse':    [0, 0, 0, 0, 0],
     'fop':        [4, 8, 10, 20, 30],
     'h2':         [0, 0, 5, 5, 8],
     'jython':     [0, 0, 5, 10, 13],
@@ -42,17 +42,15 @@
     'sunflow':    [0, 2, 5, 10, 15],
     'tomcat':     [0, 0, 5, 10, 15],
     'tradebeans': [0, 0, 5, 10, 13],
-    'tradesoap':  [2, 4, 5, 10, 15],
+    'tradesoap':  [0, 0, 5, 10, 15],
     'xalan':      [0, 0, 5, 10, 18],
 }
 
 dacapoScalaSanityWarmup = {
-# (tw) actors sometimes fails verification; hardly reproducible
-    'actors':     [0, 0, 0, 0, 0],
-# (lstadler) apparat was disabled due to a deadlock which I think is the benchmarks fault.
-    'apparat':    [0, 0, 0, 0, 0],
+    'actors':     [0, 0, 2, 5, 5],
+    'apparat':    [0, 0, 2, 5, 5],
     'factorie':   [0, 0, 2, 5, 5],
-    'kiama':      [0, 0, 3, 13, 15],
+    'kiama':      [0, 4, 3, 13, 15],
     'scalac':     [0, 0, 5, 15, 20],
     'scaladoc':   [0, 0, 5, 15, 15],
     'scalap':     [0, 0, 5, 15, 20],
@@ -67,7 +65,8 @@
 dacapoGateBuildLevels = {
     'avrora':     ['product', 'fastdebug', 'debug'],
     'batik':      ['product', 'fastdebug', 'debug'],
-    'eclipse':    ['product'],
+    # (lewurm): does not work with JDK8
+    'eclipse':    [],
     'fop':        ['fastdebug', 'debug'],
     'h2':         ['product', 'fastdebug', 'debug'],
     'jython':     ['product', 'fastdebug', 'debug'],
@@ -77,7 +76,8 @@
     'sunflow':    ['fastdebug', 'debug'],
     'tomcat':     ['product', 'fastdebug', 'debug'],
     'tradebeans': ['product', 'fastdebug', 'debug'],
-    # tradesoap is too unreliable for the gate, often crashing with "java.net.BindException: Address already in use"
+    # tradesoap is too unreliable for the gate, often crashing with concurrency problems:
+    # http://sourceforge.net/p/dacapobench/bugs/99/
     'tradesoap':  [],
     'xalan':      ['product', 'fastdebug', 'debug'],
 }
@@ -86,7 +86,7 @@
     'actors':     ['product', 'fastdebug', 'debug'],
     'apparat':    ['product', 'fastdebug', 'debug'],
     'factorie':   ['product', 'fastdebug', 'debug'],
-    'kiama':      ['product', 'fastdebug', 'debug'],
+    'kiama':      ['fastdebug', 'debug'],
     'scalac':     ['product', 'fastdebug', 'debug'],
     'scaladoc':   ['product', 'fastdebug', 'debug'],
     'scalap':     ['product', 'fastdebug', 'debug'],