Mercurial > hg > graal-jvmci-8

changeset 3553:077add4e3ccc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Mon, 22 Aug 2011 14:51:23 +0200
parents aa7b62997aa0 (diff) aee1479c0a4b (current diff)
children b20889b42d12
files
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/perf/benchmarktool.py	Mon Aug 22 14:39:05 2011 +0200
+++ b/perf/benchmarktool.py	Mon Aug 22 14:51:23 2011 +0200
@@ -85,6 +85,7 @@
         benchmarks = runBash('java -jar ' + os.environ['DACAPO'] + '/dacapo-9.12-bach.jar -l').read().decode().split(' ')
     
         benchmarkTime = re.compile(r"===== DaCapo 9\.12 ([a-zA-Z0-9_]+) ((PASSED)|(completed warmup [0-9]+)) in ([0-9]+) msec =====")
+	print('command: ' + cmd)
     
         csvOutput = [['benchmark', 'type', 'time']]
         csvOutputLine = 0
--- a/runeclipse.sh	Mon Aug 22 14:39:05 2011 +0200
+++ b/runeclipse.sh	Mon Aug 22 14:51:23 2011 +0200
@@ -15,7 +15,7 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 5 eclipse"
+COMMAND="${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal -G:-QuietBailout $* Harness --preserve -n 15 eclipse"
 echo $COMMAND
 $COMMAND
 echo $COMMAND
--- a/runfop.sh	Mon Aug 22 14:39:05 2011 +0200
+++ b/runfop.sh	Mon Aug 22 14:51:23 2011 +0200
@@ -15,4 +15,4 @@
   echo "DACAPO is not defined. It must point to a Dacapo benchmark directory."
   exit 1;
 fi
-${JDK7}/bin/java -graal -Xms1g -Xmx2g -esa -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal $* Harness --preserve -n 100 fop 
+${JDK7}/bin/java -graal -Xms1g -Xmx2g -classpath ${DACAPO}/dacapo-9.12-bach.jar -XX:-GraalBailoutIsFatal $* Harness --preserve -n 100 fop 
--- a/src/share/vm/c1/c1_globals.hpp	Mon Aug 22 14:39:05 2011 +0200
+++ b/src/share/vm/c1/c1_globals.hpp	Mon Aug 22 14:51:23 2011 +0200
@@ -57,7 +57,7 @@
           "Use graal instead of C1")                                        \
   product(bool, DebugGraal, true,                                           \
           "Enable JVMTI for the compiler thread")                           \
-  product(bool, GraalBailoutIsFatal, true,                                  \
+  product(bool, GraalBailoutIsFatal, false,                                 \
           "Abort the VM on graal bailout")                                  \
   product(bool, BootstrapGraal, true,                                       \
           "Bootstrap graal before running Java main method")                \
--- a/src/share/vm/graal/graalVMEntries.cpp	Mon Aug 22 14:39:05 2011 +0200
+++ b/src/share/vm/graal/graalVMEntries.cpp	Mon Aug 22 14:51:23 2011 +0200
@@ -747,8 +747,7 @@
 jfieldID getFieldID(JNIEnv* env, jobject obj, const char* name, const char* sig) {
   jfieldID id = env->GetFieldID(env->GetObjectClass(obj), name, sig);
   if (id == NULL) {
-    TRACE_graal_1("field not found: %s (%s)", name, sig);
-    fatal("field not found");
+    fatal(err_msg("field not found: %s (%s)", name, sig));
   }
   return id;
 }