Mercurial > hg > truffle

changeset 14569:5e04917e6616

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Truffle: renamed NodeFilter to NodeCountFilter and changed it to have inclusive implementation semantics.
author Christian Humer <christian.humer@gmail.com>
date Mon, 17 Mar 2014 18:46:39 +0100
parents 2e90d9a9a677
children 24431a9b878c
files graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallNode.java graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java
diffstat 3 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallNode.java	Mon Mar 17 14:57:14 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallNode.java	Mon Mar 17 18:46:39 2014 +0100
@@ -28,7 +28,7 @@
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.impl.*;
 import com.oracle.truffle.api.nodes.*;
-import com.oracle.truffle.api.nodes.NodeUtil.NodeFilter;
+import com.oracle.truffle.api.nodes.NodeUtil.NodeCountFilter;
 
 /**
  * Call target that is optimized by Graal upon surpassing a specific invocation threshold.
@@ -163,8 +163,8 @@
         }
 
         private int countPolymorphic() {
-            return NodeUtil.countNodes(getCallTarget().getRootNode(), new NodeFilter() {
-                public boolean isFiltered(Node node) {
+            return NodeUtil.countNodes(getCallTarget().getRootNode(), new NodeCountFilter() {
+                public boolean isCounted(Node node) {
                     NodeCost cost = node.getCost();
                     return cost == NodeCost.POLYMORPHIC || cost == NodeCost.MEGAMORPHIC;
                 }
--- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Mon Mar 17 14:57:14 2014 +0100
+++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/OptimizedCallTarget.java	Mon Mar 17 18:46:39 2014 +0100
@@ -34,7 +34,7 @@
 import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.impl.*;
 import com.oracle.truffle.api.nodes.*;
-import com.oracle.truffle.api.nodes.NodeUtil.NodeFilter;
+import com.oracle.truffle.api.nodes.NodeUtil.NodeCountFilter;
 
 /**
  * Call target that is optimized by Graal upon surpassing a specific invocation threshold.
@@ -461,14 +461,14 @@
     }
 
     static void addASTSizeProperty(RootNode target, Map<String, Object> properties) {
-        int polymorphicCount = NodeUtil.countNodes(target.getRootNode(), new NodeFilter() {
-            public boolean isFiltered(Node node) {
+        int polymorphicCount = NodeUtil.countNodes(target.getRootNode(), new NodeCountFilter() {
+            public boolean isCounted(Node node) {
                 return node.getCost() == NodeCost.POLYMORPHIC;
             }
         }, true);
 
-        int megamorphicCount = NodeUtil.countNodes(target.getRootNode(), new NodeFilter() {
-            public boolean isFiltered(Node node) {
+        int megamorphicCount = NodeUtil.countNodes(target.getRootNode(), new NodeCountFilter() {
+            public boolean isCounted(Node node) {
                 return node.getCost() == NodeCost.MEGAMORPHIC;
             }
         }, true);
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java	Mon Mar 17 14:57:14 2014 +0100
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/nodes/NodeUtil.java	Mon Mar 17 18:46:39 2014 +0100
@@ -574,19 +574,19 @@
         return countNodes(root, null, false);
     }
 
-    public static int countNodes(Node root, NodeFilter filter) {
+    public static int countNodes(Node root, NodeCountFilter filter) {
         return countNodes(root, filter, false);
     }
 
-    public static int countNodes(Node root, NodeFilter filter, boolean visitInlinedCallNodes) {
+    public static int countNodes(Node root, NodeCountFilter filter, boolean visitInlinedCallNodes) {
         NodeCountVisitor nodeCount = new NodeCountVisitor(filter, visitInlinedCallNodes);
         root.accept(nodeCount);
         return nodeCount.nodeCount;
     }
 
-    public interface NodeFilter {
+    public interface NodeCountFilter {
 
-        boolean isFiltered(Node node);
+        boolean isCounted(Node node);
 
     }
 
@@ -594,16 +594,16 @@
 
         private final boolean visitInlinedCallNodes;
         int nodeCount;
-        private final NodeFilter filter;
+        private final NodeCountFilter filter;
 
-        private NodeCountVisitor(NodeFilter filter, boolean visitInlinedCallNodes) {
+        private NodeCountVisitor(NodeCountFilter filter, boolean visitInlinedCallNodes) {
             this.filter = filter;
             this.visitInlinedCallNodes = visitInlinedCallNodes;
         }
 
         @Override
         public boolean visit(Node node) {
-            if (filter == null || !filter.isFiltered(node)) {
+            if (filter == null || filter.isCounted(node)) {
                 nodeCount++;
             }