# HG changeset patch
# User Gilles Duboscq <duboscq@ssw.jku.at>
# Date 1366216241 -7200
# Node ID 4e6df9021a59ebc60f376de6060e4b416d1fe39f
# Parent  11516ac4fbda00434e593ad1bbd718e33d0dc64a
Assemble the CTW bench in the same value, remove PEA from nocomplex

diff -r 11516ac4fbda -r 4e6df9021a59 mx/sanitycheck.py
--- a/mx/sanitycheck.py	Wed Apr 17 15:08:15 2013 +0000
+++ b/mx/sanitycheck.py	Wed Apr 17 18:30:41 2013 +0200
@@ -224,19 +224,8 @@
     Full, NoInline, NoComplex = range(3)
 
 def getCTW(vm,mode):
-    
-    modeString = ''
-    if mode == CTWMode.Full:
-        modeString = 'Full'
-    elif mode == CTWMode.NoInline:
-        modeString = 'NoInline'
-    elif mode == CTWMode.NoComplex:
-        modeString = 'NoComplex'
-    else:
-        mx.abort("Unknown CTW mode")
-    
     time = re.compile(r"CompileTheWorld : Done \([0-9]+ classes, [0-9]+ methods, (?P<time>[0-9]+) ms\)")
-    scoreMatcher = ValuesMatcher(time, {'group' : 'CompileTheWorld', 'name' : modeString + '-CompileTime', 'score' : '<time>'})
+    scoreMatcher = ValuesMatcher(time, {'group' : 'CompileTheWorld', 'name' : 'CompileTime', 'score' : '<time>'})
     
     jre = os.environ.get('JAVA_HOME')
     if exists(join(jre, 'jre')):
@@ -254,9 +243,9 @@
             args.append('-G:-Inline')
     if mode >= CTWMode.NoComplex:
         if not vm.endswith('-nograal'):
-            args += ['-G:-OptLoopTransform', '-G:-OptTailDuplication', '-G:-FullUnroll', '-G:-MemoryAwareScheduling']
+            args += ['-G:-OptLoopTransform', '-G:-OptTailDuplication', '-G:-FullUnroll', '-G:-MemoryAwareScheduling', '-G:-PartialEscapeAnalysis']
         
-    return Test("CompileTheWorld-" + modeString, args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False)
+    return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False)
     
 
 class Tee: