changeset 9164:380857cb7117

Add the CTW result in to a different value depending on the mode
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 16 Apr 2013 19:13:56 +0200
parents 45b37dcb24de
children 0735e848762a
files mx/sanitycheck.py
diffstat 1 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mx/sanitycheck.py	Tue Apr 16 19:01:24 2013 +0200
+++ b/mx/sanitycheck.py	Tue Apr 16 19:13:56 2013 +0200
@@ -224,8 +224,19 @@
     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' : 'CompileTime', 'score' : '<time>'})
+    scoreMatcher = ValuesMatcher(time, {'group' : 'CompileTheWorld', 'name' : modeString + '-CompileTime', 'score' : '<time>'})
     
     jre = os.environ.get('JAVA_HOME')
     if exists(join(jre, 'jre')):
@@ -245,7 +256,7 @@
         if not vm.endswith('-nograal'):
             args += ['-G:-OptLoopTransform', '-G:-OptTailDuplication', '-G:-FullUnroll', '-G:-MemoryAwareScheduling']
         
-    return Test("CompileTheWorld", args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False)
+    return Test("CompileTheWorld-" + mode, args, successREs=[time], scoreMatchers=[scoreMatcher], benchmarkCompilationRate=False)
     
 
 class Tee: