Merge branch 'master' into truffle-head

jruby · Sep 2, 2015 · 6820636 · 6820636
2 parents c234d8c + 7641552
commit 6820636
Showing 11 changed files with 44 additions and 4 deletions.
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -226,7 +226,13 @@ public class Options {
     public static final Option<Integer> TRUFFLE_ARRAY_SMALL = integer(TRUFFLE, "truffle.array.small", 3, "Maximum size of an Array to consider small for optimisations.");
     public static final Option<Integer> TRUFFLE_HASH_PACKED_ARRAY_MAX = integer(TRUFFLE, "truffle.hash.packed_array.max", 3, "Maximum size of a Hash to consider using the packed array storage strategy for.");
 
+    public static final Option<Integer> TRUFFLE_METHOD_LOOKUP_CACHE = integer(TRUFFLE, "truffle.method_lookup.cache", 8, "Constant lookup cache size");
     public static final Option<Integer> TRUFFLE_DISPATCH_CACHE = integer(TRUFFLE, "truffle.dispatch.cache", 8, "Dispatch (various forms of method call) cache size.");
+    public static final Option<Integer> TRUFFLE_YIELD_CACHE = integer(TRUFFLE, "truffle.yield.cache", 8, "Yield cache size.");
+    public static final Option<Integer> TRUFFLE_TO_PROC_CACHE = integer(TRUFFLE, "truffle.to_proc.cache", 8, "Method#to_proc cache size");
+    public static final Option<Integer> TRUFFLE_IS_A_CACHE = integer(TRUFFLE, "truffle.is_a.cache", 8, "Kernel#is_a? and #kind_of? cache size");
+    public static final Option<Integer> TRUFFLE_BIND_CACHE = integer(TRUFFLE, "truffle.bind.cache", 8, "Test for being able to bind a method to a module cache size");
+    public static final Option<Integer> TRUFFLE_CONSTANT_LOOKUP_CACHE = integer(TRUFFLE, "truffle.constant_lookup.cache", 8, "Constant lookup cache size");
 
     public static final Option<Boolean> TRUFFLE_CORE_ALWAYS_CLONE = bool(TRUFFLE, "truffle.core.always_clone", true, "Always clone built-in core methods.");
     public static final Option<Boolean> TRUFFLE_YIELD_ALWAYS_CLONE = bool(TRUFFLE, "truffle.yield.always_clone", true, "Always clone yields.");

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -171,10 +171,6 @@ protected NativeSockets nativeSockets() {
         return getContext().getNativeSockets();
     }
 
-    protected int getCacheLimit() {
-        return getContext().getOptions().DISPATCH_CACHE;
-    }
-
     // Helper methods for caching
 
     protected DynamicObjectFactory getInstanceFactory(DynamicObject rubyClass) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/constants/LookupConstantNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/constants/LookupConstantNode.java
@@ -105,4 +105,8 @@ protected boolean isVisible(DynamicObject module, RubyConstant constant) {
         return ignoreVisibility || constant == null || constant.isVisibleTo(getContext(), LexicalScope.NONE, module);
     }
 
+    protected int getCacheLimit() {
+        return getContext().getOptions().CONSTANT_LOOKUP_CACHE;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1121,6 +1121,10 @@ protected DynamicObject getMetaClass(VirtualFrame frame, Object object) {
             return metaClassNode.executeMetaClass(frame, object);
         }
 
+        protected int getCacheLimit() {
+            return getContext().getOptions().IS_A_CACHE;
+        }
+
     }
 
     @CoreMethod(names = "lambda", isModuleFunction = true, needsBlock = true)

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java
@@ -270,6 +270,10 @@ protected CallTarget method2proc(DynamicObject methodObject) {
             return Truffle.getRuntime().createCallTarget(newRootNode);
         }
 
+        protected int getCacheLimit() {
+            return getContext().getOptions().TO_PROC_CACHE;
+        }
+
     }
 
     private static class SetReceiverNode extends RubyNode {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/CallMethodNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/CallMethodNode.java
@@ -50,4 +50,8 @@ protected Object callMethodUncached(VirtualFrame frame, InternalMethod method, O
         return indirectCallNode.call(frame, method.getCallTarget(), frameArguments);
     }
 
+    protected int getCacheLimit() {
+        return getContext().getOptions().DISPATCH_CACHE;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/CanBindMethodToModuleNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/CanBindMethodToModuleNode.java
@@ -55,4 +55,8 @@ protected boolean canBindMethodTo(DynamicObject declaringModule, DynamicObject m
         return ModuleOperations.canBindMethodTo(declaringModule, module);
     }
 
+    protected int getCacheLimit() {
+        return getContext().getOptions().BIND_CACHE;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/methods/LookupMethodNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/methods/LookupMethodNode.java
@@ -80,4 +80,8 @@ protected InternalMethod doLookup(DynamicObject selfMetaClass, String name) {
         return method;
     }
 
+    protected int getCacheLimit() {
+        return getContext().getOptions().METHOD_LOOKUP_CACHE;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/supercall/LookupSuperMethodNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/supercall/LookupSuperMethodNode.java
@@ -108,4 +108,8 @@ protected InternalMethod doLookup(InternalMethod currentMethod, DynamicObject se
         return superMethod;
     }
 
+    protected int getCacheLimit() {
+        return getContext().getOptions().METHOD_LOOKUP_CACHE;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/yield/CallBlockNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/yield/CallBlockNode.java
@@ -93,4 +93,8 @@ protected CallNodeWrapperNode createBlockCallNode(CallTarget callTarget) {
         return callNodeWrapperNode;
     }
 
+    protected int getCacheLimit() {
+        return getContext().getOptions().YIELD_CACHE;
+    }
+
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/Options.java b/truffle/src/main/java/org/jruby/truffle/runtime/Options.java
@@ -28,7 +28,13 @@ public class Options {
 
     // Caches
 
+    public final int METHOD_LOOKUP_CACHE = org.jruby.util.cli.Options.TRUFFLE_METHOD_LOOKUP_CACHE.load();
     public final int DISPATCH_CACHE = org.jruby.util.cli.Options.TRUFFLE_DISPATCH_CACHE.load();
+    public final int YIELD_CACHE = org.jruby.util.cli.Options.TRUFFLE_YIELD_CACHE.load();
+    public final int TO_PROC_CACHE = org.jruby.util.cli.Options.TRUFFLE_TO_PROC_CACHE.load();
+    public final int IS_A_CACHE = org.jruby.util.cli.Options.TRUFFLE_IS_A_CACHE.load();
+    public final int BIND_CACHE = org.jruby.util.cli.Options.TRUFFLE_BIND_CACHE.load();
+    public final int CONSTANT_LOOKUP_CACHE = org.jruby.util.cli.Options.TRUFFLE_CONSTANT_LOOKUP_CACHE.load();
 
     // Cloning and inlining