Mercurial > hg > truffle

changeset 16502:5f458fcc4f5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move CFGVerifier to graal.compiler.common and make it abstract.
author Josef Eisl <josef.eisl@jku.at>
date Mon, 14 Jul 2014 20:23:09 +0200
parents f0f4402a4f65
children b3800429f543
files graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlock.java graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/CFGVerifier.java graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/CFGVerifier.java
diffstat 4 files changed, 135 insertions(+), 125 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlock.java	Mon Jul 14 11:06:21 2014 +0200
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/AbstractBlock.java	Mon Jul 14 20:23:09 2014 +0200
@@ -58,6 +58,10 @@
 
     T getDominator();
 
+    List<T> getDominated();
+
+    T getPostdominator();
+
     double probability();
 
     /**
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/graal/com.oracle.graal.compiler.common/src/com/oracle/graal/compiler/common/cfg/CFGVerifier.java	Mon Jul 14 20:23:09 2014 +0200
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.graal.compiler.common.cfg;
+
+import java.util.*;
+
+public class CFGVerifier {
+
+    public static <T extends AbstractBlock<T>, C extends AbstractControlFlowGraph<T>> boolean verify(C cfg) {
+        for (T block : cfg.getBlocks()) {
+            assert block.getId() >= 0;
+            assert cfg.getBlocks().get(block.getId()) == block;
+
+            for (T pred : block.getPredecessors()) {
+                assert pred.getSuccessors().contains(block);
+                assert pred.getId() < block.getId() || pred.isLoopEnd();
+            }
+
+            for (T sux : block.getSuccessors()) {
+                assert sux.getPredecessors().contains(block);
+                assert sux.getId() > block.getId() || sux.isLoopHeader();
+            }
+
+            if (block.getDominator() != null) {
+                assert block.getDominator().getId() < block.getId();
+                assert block.getDominator().getDominated().contains(block);
+            }
+            for (T dominated : block.getDominated()) {
+                assert dominated.getId() > block.getId();
+                assert dominated.getDominator() == block;
+            }
+
+            T postDominatorBlock = block.getPostdominator();
+            if (postDominatorBlock != null) {
+                assert block.getSuccessorCount() > 0 : "block has post-dominator block, but no successors";
+
+                BlockMap<Boolean> visitedBlocks = new BlockMap<>(cfg);
+                visitedBlocks.put(block, true);
+
+                Deque<T> stack = new ArrayDeque<>();
+                for (T sux : block.getSuccessors()) {
+                    visitedBlocks.put(sux, true);
+                    stack.push(sux);
+                }
+
+                while (stack.size() > 0) {
+                    T tos = stack.pop();
+                    assert tos.getId() <= postDominatorBlock.getId();
+                    if (tos == postDominatorBlock) {
+                        continue; // found a valid path
+                    }
+                    assert tos.getSuccessorCount() > 0 : "no path found";
+
+                    for (T sux : tos.getSuccessors()) {
+                        if (visitedBlocks.get(sux) == null) {
+                            visitedBlocks.put(sux, true);
+                            stack.push(sux);
+                        }
+                    }
+                }
+            }
+
+            assert cfg.getLoops() == null || !block.isLoopHeader() || block.getLoop().getHeader() == block;
+        }
+
+        if (cfg.getLoops() != null) {
+            for (Loop<T> loop : cfg.getLoops()) {
+                assert loop.getHeader().isLoopHeader();
+
+                for (T block : loop.getBlocks()) {
+                    assert block.getId() >= loop.getHeader().getId();
+
+                    Loop<?> blockLoop = block.getLoop();
+                    while (blockLoop != loop) {
+                        assert blockLoop != null;
+                        blockLoop = blockLoop.getParent();
+                    }
+
+                    if (!(block.isLoopHeader() && block.getLoop() == loop)) {
+                        for (T pred : block.getPredecessors()) {
+                            if (!loop.getBlocks().contains(pred)) {
+                                assert false : "Loop " + loop + " does not contain " + pred;
+                                return false;
+                            }
+                        }
+                    }
+                }
+
+                for (T block : loop.getExits()) {
+                    assert block.getId() >= loop.getHeader().getId();
+
+                    Loop<?> blockLoop = block.getLoop();
+                    while (blockLoop != null) {
+                        blockLoop = blockLoop.getParent();
+                        assert blockLoop != loop;
+                    }
+                }
+            }
+        }
+
+        return true;
+    }
+}
--- a/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Mon Jul 14 11:06:21 2014 +0200
+++ b/graal/com.oracle.graal.java/src/com/oracle/graal/java/BciBlockMapping.java	Mon Jul 14 20:23:09 2014 +0200
@@ -246,6 +246,14 @@
         public double probability() {
             return 1D;
         }
+
+        public List<BciBlock> getDominated() {
+            return null;
+        }
+
+        public BciBlock getPostdominator() {
+            return null;
+        }
     }
 
     public static class ExceptionDispatchBlock extends BciBlock {
--- a/graal/com.oracle.graal.nodes/src/com/oracle/graal/nodes/cfg/CFGVerifier.java	Mon Jul 14 11:06:21 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2012, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package com.oracle.graal.nodes.cfg;
-
-import java.util.*;
-
-import com.oracle.graal.compiler.common.cfg.*;
-
-public class CFGVerifier {
-
-    public static boolean verify(ControlFlowGraph cfg) {
-        for (Block block : cfg.getBlocks()) {
-            assert block.getId() >= 0;
-            assert cfg.getBlocks().get(block.getId()) == block;
-
-            for (Block pred : block.getPredecessors()) {
-                assert pred.getSuccessors().contains(block);
-                assert pred.getId() < block.getId() || pred.isLoopEnd();
-            }
-
-            for (Block sux : block.getSuccessors()) {
-                assert sux.getPredecessors().contains(block);
-                assert sux.getId() > block.getId() || sux.isLoopHeader();
-            }
-
-            if (block.getDominator() != null) {
-                assert block.getDominator().getId() < block.getId();
-                assert block.getDominator().getDominated().contains(block);
-            }
-            for (Block dominated : block.getDominated()) {
-                assert dominated.getId() > block.getId();
-                assert dominated.getDominator() == block;
-            }
-
-            Block postDominatorBlock = block.getPostdominator();
-            if (postDominatorBlock != null) {
-                assert block.getSuccessorCount() > 0 : "block has post-dominator block, but no successors";
-
-                BlockMap<Boolean> visitedBlocks = new BlockMap<>(cfg);
-                visitedBlocks.put(block, true);
-
-                Deque<Block> stack = new ArrayDeque<>();
-                for (Block sux : block.getSuccessors()) {
-                    visitedBlocks.put(sux, true);
-                    stack.push(sux);
-                }
-
-                while (stack.size() > 0) {
-                    Block tos = stack.pop();
-                    assert tos.getId() <= postDominatorBlock.getId();
-                    if (tos == postDominatorBlock) {
-                        continue; // found a valid path
-                    }
-                    assert tos.getSuccessorCount() > 0 : "no path found";
-
-                    for (Block sux : tos.getSuccessors()) {
-                        if (visitedBlocks.get(sux) == null) {
-                            visitedBlocks.put(sux, true);
-                            stack.push(sux);
-                        }
-                    }
-                }
-            }
-
-            assert cfg.getLoops() == null || !block.isLoopHeader() || block.getLoop().getHeader() == block : block.beginNode;
-        }
-
-        if (cfg.getLoops() != null) {
-            for (Loop<Block> loop : cfg.getLoops()) {
-                assert loop.getHeader().isLoopHeader();
-
-                for (Block block : loop.getBlocks()) {
-                    assert block.getId() >= loop.getHeader().getId();
-
-                    Loop<?> blockLoop = block.getLoop();
-                    while (blockLoop != loop) {
-                        assert blockLoop != null;
-                        blockLoop = blockLoop.getParent();
-                    }
-
-                    if (!(block.isLoopHeader() && block.getLoop() == loop)) {
-                        for (Block pred : block.getPredecessors()) {
-                            if (!loop.getBlocks().contains(pred)) {
-                                assert false : "Loop " + loop + " does not contain " + pred;
-                                return false;
-                            }
-                        }
-                    }
-                }
-
-                for (Block block : loop.getExits()) {
-                    assert block.getId() >= loop.getHeader().getId();
-
-                    Loop<?> blockLoop = block.getLoop();
-                    while (blockLoop != null) {
-                        blockLoop = blockLoop.getParent();
-                        assert blockLoop != loop;
-                    }
-                }
-            }
-        }
-
-        return true;
-    }
-}