Mercurial > hg > truffle

changeset 6990:e3ada110d3cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Small cleanups after NPG
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 19 Nov 2012 16:15:53 +0100
parents 2afd99933ae6
children 17fd2de85bf7
files mx/sanitycheck.py src/share/vm/graal/graalCompilerToVM.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mx/sanitycheck.py	Mon Nov 19 15:42:58 2012 +0100
+++ b/mx/sanitycheck.py	Mon Nov 19 16:15:53 2012 +0100
@@ -162,7 +162,7 @@
     dacapoMatcher = Matcher(dacapoTime, {'const:group' : "const:DaCapo", 'const:name' : 'benchmark', 'const:score' : 'time'}, startNewLine=True)
     dacapoMatcher1 = Matcher(dacapoTime1, {'const:group' : "const:DaCapo-1stRun", 'const:name' : 'benchmark', 'const:score' : 'time'})
     
-    return Test("DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher, dacapoMatcher1], ['-Xms2g', '-XX:MaxPermSize=256m', '-XX:+UseSerialGC'])
+    return Test("DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher, dacapoMatcher1], ['-Xms2g', '-XX:+UseSerialGC'])
 
 def getScalaDacapos(level=SanityCheckLevel.Normal, gateBuildLevel=None, dacapoArgs=[]):
     checks = []
@@ -192,7 +192,7 @@
     
     dacapoMatcher = Matcher(dacapoTime, {'const:group' : "const:Scala-DaCapo", 'const:name' : 'benchmark', 'const:score' : 'time'})
     
-    return Test("Scala-DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher], ['-Xms2g', '-XX:MaxPermSize=256m', '-XX:+UseSerialGC'])
+    return Test("Scala-DaCapo-" + name, ['-jar', dacapo, name, '-n', str(n), ] + dacapoArgs, [dacapoSuccess], [dacapoFail], [dacapoMatcher], ['-Xms2g', '-XX:+UseSerialGC'])
 
 def getBootstraps():
     time = re.compile(r"Bootstrapping Graal\.+ in (?P<time>[0-9]+) ms")
--- a/src/share/vm/graal/graalCompilerToVM.cpp	Mon Nov 19 15:42:58 2012 +0100
+++ b/src/share/vm/graal/graalCompilerToVM.cpp	Mon Nov 19 16:15:53 2012 +0100
@@ -109,7 +109,7 @@
   }
 
   if (reconstituted_code == NULL) {
-    env->SetByteArrayRegion(result, 0, code_size, (const jbyte *) method->code_base());
+    env->SetByteArrayRegion(result, 0, code_size, (jbyte *) method->code_base());
   } else {
     env->SetByteArrayRegion(result, 0, code_size, reconstituted_code);
   }