Mercurial > hg > truffle

changeset 3202:9352a9c26095

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert outer framesate scheduling change
author Gilles Duboscq <gilles.duboscq@oracle.com>
date Fri, 08 Jul 2011 18:00:39 +0200
parents 38792f959479
children ccae0eb6c652
files graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/DeadCodeEliminationPhase.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/util/LoopUtil.java runtests.sh
diffstat 4 files changed, 14 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/DeadCodeEliminationPhase.java	Fri Jul 08 15:00:16 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/DeadCodeEliminationPhase.java	Fri Jul 08 18:00:39 2011 +0200
@@ -76,8 +76,8 @@
             if (current instanceof AbstractVectorNode) {
                 for (Node usage : current.usages()) {
                     flood.add(usage);
-        }
-    }
+                }
+            }
         }
     }
 
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java	Fri Jul 08 15:00:16 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/schedule/IdentifyBlocksPhase.java	Fri Jul 08 18:00:39 2011 +0200
@@ -323,8 +323,6 @@
                         block = getCommonDominator(block, mergeBlock.getPredecessors().get(i));
                     }
                 }
-            } else if (usage instanceof FrameState && ((FrameState) usage).outerFrameState() == n) {
-                block = getCommonDominator(block, assignLatestPossibleBlockToNode(usage));
             } else if (usage instanceof FrameState && ((FrameState) usage).block() != null) {
                 Merge merge = ((FrameState) usage).block();
                 for (Node pred : merge.cfgPredecessors()) {
@@ -519,7 +517,7 @@
 
         int cnt = 0;
         while (!workList.isEmpty()) {
-            if (cnt++ > blocks.size() * 15) {
+            if (cnt++ > blocks.size() * 20) {
                 throw new RuntimeException("(ls) endless loop in computeDominators?");
             }
             Block b = workList.remove();
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/util/LoopUtil.java	Fri Jul 08 15:00:16 2011 +0200
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/util/LoopUtil.java	Fri Jul 08 18:00:39 2011 +0200
@@ -231,6 +231,11 @@
                     }
                 }
             }
+            if (n instanceof AbstractVectorNode) {
+                for (Node usage : n.usages()) {
+                    workData2.add(usage);
+                }
+            }
             if (n instanceof StateSplit) {
                 FrameState stateAfter = ((StateSplit) n).stateAfter();
                 if (stateAfter != null) {
@@ -819,6 +824,11 @@
                         }
                     }
                 }
+                if (n instanceof AbstractVectorNode) {
+                    for (Node usage : n.usages()) {
+                        work.add(usage);
+                    }
+                }
                 if (n instanceof LoopBegin && n != loop.loopBegin()) {
                     Loop p = loop.parent;
                     boolean isParent = false;
--- a/runtests.sh	Fri Jul 08 15:00:16 2011 +0200
+++ b/runtests.sh	Fri Jul 08 18:00:39 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:+PrintCompilation -XX:CompileOnly=jtt $@ -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ 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 -XX:+PrintCompilation -XX:CompileOnly=jtt $@ -Xbootclasspath/p:"${MAXINE}/com.oracle.max.vm/bin" -Xbootclasspath/p:"${MAXINE}/com.oracle.max.base/bin" $@ 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 ${TESTDIR}/jtt/hotspot