changeset 2704:efbdb3ea95c9

Remove critical edge split identification.
author Thomas Wuerthinger <thomas@wuerthinger.net>
date Wed, 18 May 2011 17:27:06 +0200
parents 42450f536d24
children d669ab61c7c7
files 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 graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java
diffstat 4 files changed, 0 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java	Wed May 18 17:04:47 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/debug/CFGPrinter.java	Wed May 18 17:27:06 2011 +0200
@@ -153,9 +153,6 @@
         if (block.isExceptionEntry()) {
             out.print("\"ex\" ");
         }
-        if (block.isCriticalEdgeSplit()) {
-            out.print("\"ces\" ");
-        }
         if (block.isLinearScanLoopHeader()) {
             out.print("\"llh\" ");
         }
--- a/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Wed May 18 17:04:47 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/graph/IR.java	Wed May 18 17:27:06 2011 +0200
@@ -167,8 +167,6 @@
         // create new successor and mark it for special block order treatment
         BlockBegin newSucc = new BlockBegin(bci, nextBlockNumber(), compilation.graph);
 
-        newSucc.setCriticalEdgeSplit(true);
-
         // This goto is not a safepoint.
         Goto e = new Goto(target, null, false, compilation.graph);
         newSucc.appendNext(e, bci);
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Wed May 18 17:04:47 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/BlockBegin.java	Wed May 18 17:27:06 2011 +0200
@@ -98,7 +98,6 @@
         IsOnWorkList,
         WasVisited,
         ParserLoopHeader,
-        CriticalEdgeSplit,
         LinearScanLoopHeader,
         LinearScanLoopEnd;
 
@@ -460,14 +459,6 @@
         }
     }
 
-    public boolean isCriticalEdgeSplit() {
-        return checkBlockFlag(BlockFlag.CriticalEdgeSplit);
-    }
-
-    public void setCriticalEdgeSplit(boolean value) {
-        setBlockFlag(BlockFlag.CriticalEdgeSplit, value);
-    }
-
     public boolean isExceptionEntry() {
         return checkBlockFlag(BlockFlag.ExceptionEntry);
     }
--- a/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java	Wed May 18 17:04:47 2011 +0200
+++ b/graal/GraalCompiler/src/com/sun/c1x/ir/ComputeLinearScanOrder.java	Wed May 18 17:27:06 2011 +0200
@@ -353,13 +353,6 @@
         }
         curBit--;
 
-        // critical edge split blocks are preferred because then they have a greater
-        // probability to be completely empty
-        if (cur.isCriticalEdgeSplit()) {
-            weight |= (1 << curBit);
-        }
-        curBit--;
-
         // exceptions should not be thrown in normal control flow, so these blocks
         // are added as late as possible
         if (!(cur.end() instanceof Throw) && (singleSux == null || !(singleSux.end() instanceof Throw))) {
@@ -504,7 +497,6 @@
                 TTY.print(String.format("%4d: B%02d    loop: %2d  depth: %2d", cur.linearScanNumber(), cur.blockID, cur.loopIndex(), cur.loopDepth()));
 
                 TTY.print(cur.isExceptionEntry() ? " ex" : "   ");
-                TTY.print(cur.isCriticalEdgeSplit() ? " ce" : "   ");
                 TTY.print(cur.isLinearScanLoopHeader() ? " lh" : "   ");
                 TTY.print(cur.isLinearScanLoopEnd() ? " le" : "   ");