Keep NFI source objects if expecte to be used repeatedly

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CExtNodes.java

@@ -156,6 +156,7 @@
 import com.oracle.graal.python.nodes.util.CastToTruffleStringNode;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.runtime.PythonContext.GetThreadStateNode;
+import com.oracle.graal.python.runtime.PythonOptions;
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.exception.PythonErrorType;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
@@ -1598,6 +1599,10 @@ abstract static class MultiPhaseExtensionModuleInitNode extends Node {
     @GenerateUncached
     @GenerateInline(false) // footprint reduction 68 -> 49
     public abstract static class CreateModuleNode extends MultiPhaseExtensionModuleInitNode {
+        private static final String NFI_CREATE_NAME = "create";
+        private static final String NFI_CREATE_SRC = "(POINTER,POINTER):POINTER";
+        private static final Source NFI_LIBFFI_CREATE = Source.newBuilder(J_NFI_LANGUAGE, NFI_CREATE_SRC, NFI_CREATE_NAME).build();
+        private static final Source NFI_PANAMA_CREATE = Source.newBuilder(J_NFI_LANGUAGE, "with panama " + NFI_CREATE_SRC, NFI_CREATE_NAME).build();
 
         public abstract Object execute(CApiContext capiContext, ModuleSpec moduleSpec, Object moduleDef, Object library);
 
@@ -1672,13 +1677,15 @@ static Object doGeneric(CApiContext capiContext, ModuleSpec moduleSpec, Object m
                 Object[] cArguments = new Object[]{PythonToNativeNode.executeUncached(moduleSpec.originalModuleSpec), moduleDef};
                 try {
                     Object result;
+                    PythonContext context = capiContext.getContext();
                     if (!interopLib.isExecutable(createFunction)) {
-                        Object signature = capiContext.getContext().getEnv().parseInternal(Source.newBuilder(J_NFI_LANGUAGE, "(POINTER,POINTER):POINTER", "exec").build()).call();
+                        boolean panama = context.getOption(PythonOptions.UsePanama);
+                        Object signature = context.getEnv().parseInternal(panama ? NFI_PANAMA_CREATE : NFI_LIBFFI_CREATE).call();
                         result = interopLib.execute(SignatureLibrary.getUncached().bind(signature, createFunction), cArguments);
                     } else {
                         result = interopLib.execute(createFunction, cArguments);
                     }
-                    CheckFunctionResultNode.checkFunctionResult(inliningTarget, mName, interopLib.isNull(result), true, PythonLanguage.get(raiseNode), capiContext.getContext(), errOccurredProfile,
+                    CheckFunctionResultNode.checkFunctionResult(inliningTarget, mName, interopLib.isNull(result), true, PythonLanguage.get(raiseNode), context, errOccurredProfile,
                                     ErrorMessages.CREATION_FAILD_WITHOUT_EXCEPTION, ErrorMessages.CREATION_RAISED_EXCEPTION);
                     module = toJavaNode.execute(result);
                 } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
@@ -1733,6 +1740,9 @@ static Object doGeneric(CApiContext capiContext, ModuleSpec moduleSpec, Object m
     @GenerateUncached
     @GenerateInline(false) // footprint reduction 60 -> 42
     public abstract static class ExecModuleNode extends MultiPhaseExtensionModuleInitNode {
+        private static final String NFI_EXEC_SRC = "(POINTER):SINT32";
+        private static final Source NFI_LIBFFI_EXEC = Source.newBuilder(J_NFI_LANGUAGE, NFI_EXEC_SRC, "exec").build();
+        private static final Source NFI_PANAMA_EXEC = Source.newBuilder(J_NFI_LANGUAGE, "with panama " + NFI_EXEC_SRC, "exec").build();
 
         public abstract int execute(CApiContext capiContext, PythonModule module, Object moduleDef);
 
@@ -1781,8 +1791,10 @@ static int doGeneric(CApiContext capiContext, PythonModule module, Object module
                             break;
                         case SLOT_PY_MOD_EXEC:
                             Object execFunction = readPointerNode.readStructArrayElement(slotDefinitions, i, PyModuleDef_Slot__value);
+                            PythonContext context = capiContext.getContext();
                             if (!U.isExecutable(execFunction)) {
-                                Object signature = capiContext.getContext().getEnv().parseInternal(Source.newBuilder(J_NFI_LANGUAGE, "(POINTER):SINT32", "exec").build()).call();
+                                boolean panama = context.getOption(PythonOptions.UsePanama);
+                                Object signature = context.getEnv().parseInternal(panama ? NFI_PANAMA_EXEC : NFI_LIBFFI_EXEC).call();
                                 execFunction = SignatureLibrary.getUncached().bind(signature, execFunction);
                             }
                             Object result = interopLib.execute(execFunction, PythonToNativeNode.executeUncached(module));
@@ -1794,7 +1806,7 @@ static int doGeneric(CApiContext capiContext, PythonModule module, Object module
                              * and won't ignore this if no error is set. This is then the same
                              * behaviour if we would have a pointer return type and got 'NULL'.
                              */
-                            CheckFunctionResultNode.checkFunctionResult(inliningTarget, mName, iResult != 0, true, PythonLanguage.get(raiseNode), capiContext.getContext(),
+                            CheckFunctionResultNode.checkFunctionResult(inliningTarget, mName, iResult != 0, true, PythonLanguage.get(raiseNode), context,
                                             InlinedConditionProfile.getUncached(), ErrorMessages.EXECUTION_FAILED_WITHOUT_EXCEPTION, ErrorMessages.EXECUTION_RAISED_EXCEPTION);
                             break;
                         default:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/common/CExtContext.java

@@ -54,6 +54,7 @@
 import java.io.IOException;
 import java.nio.file.LinkOption;
 
+import org.graalvm.collections.Pair;
 import org.graalvm.shadowed.com.ibm.icu.impl.Punycode;
 import org.graalvm.shadowed.com.ibm.icu.text.StringPrepParseException;
 
@@ -424,7 +425,9 @@ public static Object ensureExecutable(final Object callable, NativeCExtSymbol si
             boolean panama = PythonOptions.UsePanama.getValue(env.getOptions());
 
             assert sig.getSignature() != null && !sig.getSignature().isEmpty();
-            Object nfiSignature = env.parseInternal(Source.newBuilder("nfi", (panama ? "with panama " : "") + sig.getSignature(), sig.getName()).build()).call();
+            String src = (panama ? "with panama " : "") + sig.getSignature();
+            Source nfiSource = pythonContext.getLanguage().getOrCreateSource(CExtContext::buildNFISource, Pair.create(src, sig.getName()));
+            Object nfiSignature = env.parseInternal(nfiSource).call();
 
             /*
              * Since we mix native and LLVM execution, it happens that 'callable' is an LLVM pointer
@@ -448,4 +451,9 @@ public static Object ensureExecutable(final Object callable, NativeCExtSymbol si
         // nothing to do
         return callable;
     }
+
+    private static Source buildNFISource(Object key) {
+        Pair<?, ?> srcAndName = (Pair<?, ?>) key;
+        return Source.newBuilder(J_NFI_LANGUAGE, (String) srcAndName.getLeft(), (String) srcAndName.getRight()).build();
+    }
 }