[GR-14758] Improve function generation.

PullRequest: graalpython/460

Author: fangerer

graalpython/benchmarks/src/micro/generate-functions.py

@@ -0,0 +1,60 @@
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+def count(num):
+    def foo(n): 
+        def bar(): 
+            return n+1 
+        return bar()
+
+    last_val = -1
+    for i in range(num):
+        last_val = foo(i)
+
+    return last_val
+
+
+def measure(num):
+    result = count(num)
+    print("last value: %s " % result)
+
+
+def __benchmark__(num=10000):
+    measure(num)
+

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/function/PFunction.java

@@ -34,6 +34,7 @@
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
+import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
 import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
 import com.oracle.truffle.api.Assumption;
 import com.oracle.truffle.api.CompilerAsserts;
@@ -49,8 +50,8 @@ public class PFunction extends PythonObject {
     private static final Object[] EMPTY_DEFAULTS = new Object[0];
     private final String name;
     private final String enclosingClassName;
-    private final Assumption codeStableAssumption = Truffle.getRuntime().createAssumption("function code unchanged for " + getQualifiedName());
-    private final Assumption defaultsStableAssumption = Truffle.getRuntime().createAssumption("function defaults unchanged " + getQualifiedName());
+    private final Assumption codeStableAssumption = Truffle.getRuntime().createAssumption();
+    private final Assumption defaultsStableAssumption = Truffle.getRuntime().createAssumption();
     private final PythonObject globals;
     private final PCell[] closure;
     private final boolean isStatic;
@@ -64,6 +65,11 @@ public PFunction(LazyPythonClass clazz, String name, String enclosingClassName,
 
     public PFunction(LazyPythonClass clazz, String name, String enclosingClassName, RootCallTarget callTarget, PythonObject globals, Object[] defaultValues, PKeyword[] kwDefaultValues,
                     PCell[] closure) {
+        this(clazz, name, enclosingClassName, callTarget, globals, defaultValues, kwDefaultValues, closure, null);
+    }
+
+    public PFunction(LazyPythonClass clazz, String name, String enclosingClassName, RootCallTarget callTarget, PythonObject globals, Object[] defaultValues, PKeyword[] kwDefaultValues,
+                    PCell[] closure, WriteAttributeToDynamicObjectNode writeAttrNode) {
         super(clazz);
         this.name = name;
         this.code = new PCode(PythonBuiltinClassType.PCode, callTarget);
@@ -73,13 +79,17 @@ public PFunction(LazyPythonClass clazz, String name, String enclosingClassName,
         this.defaultValues = defaultValues == null ? EMPTY_DEFAULTS : defaultValues;
         this.kwDefaultValues = kwDefaultValues == null ? PKeyword.EMPTY_KEYWORDS : kwDefaultValues;
         this.closure = closure;
-        addDefaultConstants(this.getStorage(), name, enclosingClassName);
+        addDefaultConstants(writeAttrNode, getStorage(), name, enclosingClassName);
     }
 
-    @TruffleBoundary
-    private static void addDefaultConstants(DynamicObject storage, String name, String enclosingClassName) {
-        storage.define(__NAME__, name);
-        storage.define(__QUALNAME__, enclosingClassName != null ? enclosingClassName + "." + name : name);
+    private static void addDefaultConstants(WriteAttributeToDynamicObjectNode writeAttrNode, DynamicObject storage, String name, String enclosingClassName) {
+        if (writeAttrNode != null) {
+            writeAttrNode.execute(storage, __NAME__, name);
+            writeAttrNode.execute(storage, __QUALNAME__, enclosingClassName != null ? enclosingClassName + "." + name : name);
+        } else {
+            storage.define(__NAME__, name);
+            storage.define(__QUALNAME__, enclosingClassName != null ? enclosingClassName + "." + name : name);
+        }
     }
 
     public boolean isStatic() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/function/FunctionDefinitionNode.java

@@ -31,6 +31,7 @@
 import com.oracle.graal.python.builtins.objects.function.PFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.nodes.SpecialAttributeNames;
+import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
 import com.oracle.graal.python.nodes.attributes.WriteAttributeToObjectNode;
 import com.oracle.graal.python.nodes.expression.ExpressionNode;
 import com.oracle.graal.python.parser.DefinitionCellSlots;
@@ -53,6 +54,8 @@ public class FunctionDefinitionNode extends ExpressionDefinitionNode {
     @Children protected KwDefaultExpressionNode[] kwDefaults;
     @Child private ExpressionNode doc;
     @Child private WriteAttributeToObjectNode writeDocNode = WriteAttributeToObjectNode.create();
+    @Child private WriteAttributeToDynamicObjectNode writeNameNode = WriteAttributeToDynamicObjectNode.create();
+    @Child private PythonObjectFactory factory = PythonObjectFactory.create();
 
     public FunctionDefinitionNode(String functionName, String enclosingClassName, ExpressionNode doc, ExpressionNode[] defaults, KwDefaultExpressionNode[] kwDefaults,
                     RootCallTarget callTarget,
@@ -74,7 +77,7 @@ protected PythonContext getContext() {
     }
 
     protected PythonObjectFactory factory() {
-        return getContext().getCore().factory();
+        return factory;
     }
 
     private static boolean noNullElements(Object[] array) {
@@ -91,7 +94,7 @@ public Object execute(VirtualFrame frame) {
         Object[] defaultValues = computeDefaultValues(frame);
         PKeyword[] kwDefaultValues = computeKwDefaultValues(frame);
         PCell[] closure = getClosureFromGeneratorOrFunctionLocals(frame);
-        return withDocString(frame, factory().createFunction(functionName, enclosingClassName, callTarget, PArguments.getGlobals(frame), defaultValues, kwDefaultValues, closure));
+        return withDocString(frame, factory().createFunction(functionName, enclosingClassName, callTarget, PArguments.getGlobals(frame), defaultValues, kwDefaultValues, closure, writeNameNode));
     }
 
     @ExplodeLoop

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/object/PythonObjectFactory.java

@@ -113,6 +113,7 @@
 import com.oracle.graal.python.builtins.objects.type.PythonAbstractClass;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.zipimporter.PZipImporter;
+import com.oracle.graal.python.nodes.attributes.WriteAttributeToDynamicObjectNode;
 import com.oracle.graal.python.parser.ExecutionCellSlots;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
@@ -363,6 +364,11 @@ public PFunction createFunction(String name, String enclosingClassName, RootCall
         return trace(new PFunction(PythonBuiltinClassType.PFunction, name, enclosingClassName, callTarget, globals, defaultValues, kwDefaultValues, closure));
     }
 
+    public PFunction createFunction(String name, String enclosingClassName, RootCallTarget callTarget, PythonObject globals, Object[] defaultValues, PKeyword[] kwDefaultValues,
+                    PCell[] closure, WriteAttributeToDynamicObjectNode writeAttrNode) {
+        return trace(new PFunction(PythonBuiltinClassType.PFunction, name, enclosingClassName, callTarget, globals, defaultValues, kwDefaultValues, closure, writeAttrNode));
+    }
+
     public PBuiltinFunction createBuiltinFunction(String name, LazyPythonClass type, int numDefaults, RootCallTarget callTarget) {
         return trace(new PBuiltinFunction(PythonBuiltinClassType.PBuiltinFunction, name, type, numDefaults, callTarget));
     }

mx.graalpython/mx_graalpython_bench_param.py

@@ -98,6 +98,7 @@
     'call-classmethod': ITER_15 + ['50000000'],
     'mmap-anonymous': ITER_15 + ['1000'],
     'mmap-file': ITER_15 + ['1000'],
+    'generate-functions': ITER_15 + ['10000000'],
 }