Mercurial > hg > graal-compiler

changeset 2719:ae1c50a03297

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed regression.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Thu, 19 May 2011 16:26:32 +0200
parents c1ce2a53d6c3
children 6ebf4d4d72c1
files graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java graal/GraalCompiler/src/com/sun/c1x/graph/IR.java graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java runtests.sh
diffstat 6 files changed, 8 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java	Thu May 19 16:05:42 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/C1XCompilation.java	Thu May 19 16:26:32 2011 +0200
@@ -284,8 +284,7 @@
             }
 
             if (compiler.isObserved()) {
-                // TODO(tw): FIXME
-                // compiler.fireCompilationEvent(new CompilationEvent(this, "After code generation", hir.startBlock, false, true, targetMethod));
+                compiler.fireCompilationEvent(new CompilationEvent(this, "After code generation", hir.getHIRStartBlock(), false, true, targetMethod));
             }
 
             if (C1XOptions.PrintTimers) {
--- a/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java	Thu May 19 16:05:42 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/alloc/LinearScan.java	Thu May 19 16:26:32 2011 +0200
@@ -2122,8 +2122,7 @@
         }
 
         if (compilation.compiler.isObserved()) {
-            // TODO(tw): FIXME
-            //compilation.compiler.fireCompilationEvent(new CompilationEvent(compilation, label, compilation.hir().startBlock, hirValid, true));
+            compilation.compiler.fireCompilationEvent(new CompilationEvent(compilation, label, compilation.hir().getHIRStartBlock(), hirValid, true));
         }
     }
 
--- a/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java	Thu May 19 16:05:42 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java	Thu May 19 16:26:32 2011 +0200
@@ -42,8 +42,6 @@
  * Utility for printing the control flow graph of a method being compiled by C1X at various compilation phases.
  * The output format matches that produced by HotSpot so that it can then be fed to the
  * <a href="https://c1visualizer.dev.java.net/">C1 Visualizer</a>.
- *
- * @author Doug Simon
  */
 public class CFGPrinter {
     private static final String COLUMN_END = " <|@";
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Thu May 19 16:05:42 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Thu May 19 16:26:32 2011 +0200
@@ -130,18 +130,12 @@
 
             for (BlockBegin bb : blocks) {
                 LIRBlock lirBlock = bb.lirBlock();
-                for (Node n : bb.predecessors()) {
-                    if (n instanceof BlockEnd) {
-                        BlockEnd end = (BlockEnd) n;
-                        lirBlock.blockPredecessors().add(end.block().lirBlock());
-                    }
+                for (int i = 0; i < bb.numberOfPreds(); ++i) {
+                    lirBlock.blockPredecessors().add(bb.predAt(i).block().lirBlock());
                 }
 
-                for (Node n : bb.successors()) {
-                    if (n instanceof BlockBegin) {
-                        BlockBegin begin = (BlockBegin) n;
-                        lirBlock.blockSuccessors().add(begin.lirBlock());
-                    }
+                for (int i = 0; i < bb.numberOfSux(); ++i) {
+                    lirBlock.blockSuccessors().add(bb.suxAt(i).lirBlock());
                 }
 
                 Instruction first = bb;
@@ -186,8 +180,7 @@
         }
 
         if (compilation.compiler.isObserved()) {
-            // TODO(tw): FIXME
-            // compilation.compiler.fireCompilationEvent(new CompilationEvent(compilation, phase, startBlock, true, false));
+            compilation.compiler.fireCompilationEvent(new CompilationEvent(compilation, phase, getHIRStartBlock(), true, false));
         }
     }
 
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Thu May 19 16:05:42 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Thu May 19 16:26:32 2011 +0200
@@ -691,12 +691,5 @@
         }
     }
 
-    public void verifyPredecessors() {
-        for (int i = 0; i < numberOfPreds(); i++) {
-            predAt(i);
-        }
-
-    }
-
 
 }
--- a/runtests.sh	Thu May 19 16:05:42 2011 +0200
+++ b/runtests.sh	Thu May 19 16:26:32 2011 +0200
@@ -12,4 +12,4 @@
   exit 1;
 fi
 TESTDIR=${MAXINE}/com.oracle.max.vm/test
-${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -XX:+TraceDeoptimization -XX:-TraceExceptions -XX:+PrintCompilation -XX:CompileOnly=jtt/except/BC_dastore -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -C1X:+PrintAssembly -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads
+${JDK7}/bin/java -client -d64 -graal -ea -esa -Xcomp -C1X:+PrintCFGToFile -XX:+TraceDeoptimization -XX:-TraceExceptions -XX:+PrintCompilation -XX:CompileOnly=jtt/except/BC_dastore -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -C1X:+PrintAssembly -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $1 test.com.sun.max.vm.compiler.JavaTester -verbose=1 -gen-run-scheme=false -run-scheme-package=all ${TESTDIR}/jtt/bytecode ${TESTDIR}/jtt/except ${TESTDIR}/jtt/hotpath ${TESTDIR}/jtt/jdk ${TESTDIR}/jtt/lang ${TESTDIR}/jtt/loop ${TESTDIR}/jtt/micro ${TESTDIR}/jtt/optimize ${TESTDIR}/jtt/reflect ${TESTDIR}/jtt/threads