cache so ABI in PythonContext

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ImpModuleBuiltins.java

@@ -57,7 +57,6 @@
 import com.oracle.graal.python.builtins.PythonBuiltins;
 import com.oracle.graal.python.builtins.modules.PythonCextBuiltinsFactory.DefaultCheckFunctionResultNodeGen;
 import com.oracle.graal.python.builtins.objects.PNone;
-import com.oracle.graal.python.builtins.objects.PythonAbstractObjectFactory.PInteropGetAttributeNodeGen;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytesLike;
 import com.oracle.graal.python.builtins.objects.cext.capi.CExtNodesFactory.AsPythonObjectNodeGen;
@@ -117,10 +116,8 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.library.CachedLibrary;
-import com.oracle.truffle.api.nodes.LanguageInfo;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.Source.SourceBuilder;
-import com.oracle.truffle.llvm.api.Toolchain;
 
 @CoreFunctions(defineModule = "_imp")
 public class ImpModuleBuiltins extends PythonBuiltins {
@@ -341,7 +338,7 @@ private Object loadDynamicModuleWithSpec(String name, String path, InteropLibrar
             String basename = name.substring(name.lastIndexOf('.') + 1);
             TruffleObject sulongLibrary;
             try {
-                String extSuffix = ExtensionSuffixesNode.getSoAbi(context);
+                String extSuffix = context.getSoAbi();
                 CallTarget callTarget = env.parseInternal(Source.newBuilder(LLVM_LANGUAGE, context.getPublicTruffleFileRelaxed(path, extSuffix)).build());
                 sulongLibrary = (TruffleObject) callTarget.call();
             } catch (SecurityException e) {
@@ -443,7 +440,7 @@ private void ensureCapiWasLoaded(String name, String path) throws IOException, I
                 Env env = context.getEnv();
                 CompilerDirectives.transferToInterpreterAndInvalidate();
 
-                String libPythonName = "libpython" + ExtensionSuffixesNode.getSoAbi(context);
+                String libPythonName = "libpython" + context.getSoAbi();
                 TruffleFile homePath = env.getInternalTruffleFile(context.getCAPIHome());
                 TruffleFile capiFile = homePath.resolve(libPythonName);
                 Object capi;
@@ -481,7 +478,7 @@ private GraalHPyContext ensureHPyWasLoaded(PythonContext context, String name, S
                 Env env = context.getEnv();
                 CompilerDirectives.transferToInterpreterAndInvalidate();
 
-                String libPythonName = "libhpy" + ExtensionSuffixesNode.getSoAbi(context);
+                String libPythonName = "libhpy" + context.getSoAbi();
                 TruffleFile homePath = env.getInternalTruffleFile(context.getCAPIHome());
                 TruffleFile capiFile = homePath.resolve(libPythonName);
                 try {
@@ -703,34 +700,7 @@ public abstract static class ExtensionSuffixesNode extends PythonBuiltinNode {
         @Specialization
         Object run(
                         @CachedContext(PythonLanguage.class) PythonContext ctxt) {
-            String soAbi = getSoAbi(ctxt);
-            return factory().createList(new Object[]{soAbi, HPY_SUFFIX, ".so", ".dylib", ".su"});
-        }
-
-        @TruffleBoundary
-        public static String getSoAbi(PythonContext ctxt) {
-            PythonModule sysModule = ctxt.getCore().lookupBuiltinModule("sys");
-            Object implementationObj = ReadAttributeFromObjectNode.getUncached().execute(sysModule, "implementation");
-            // sys.implementation.cache_tag
-            String cacheTag = (String) PInteropGetAttributeNodeGen.getUncached().execute(implementationObj, "cache_tag");
-            // sys.implementation._multiarch
-            String multiArch = (String) PInteropGetAttributeNodeGen.getUncached().execute(implementationObj, "_multiarch");
-
-            Env env = ctxt.getEnv();
-            LanguageInfo llvmInfo = env.getInternalLanguages().get(GraalPythonModuleBuiltins.LLVM_LANGUAGE);
-            Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
-            String toolchainId = toolchain.getIdentifier();
-
-            // only use '.dylib' if we are on 'Darwin-native'
-            String soExt;
-            if ("darwin".equals(PythonUtils.getPythonOSName()) && "native".equals(toolchainId)) {
-                soExt = ".dylib";
-            } else {
-                soExt = ".so";
-            }
-
-            return "." + cacheTag + "-" + toolchainId + "-" + multiArch + soExt;
+            return factory().createList(new Object[]{ctxt.getSoAbi(), HPY_SUFFIX, ".so", ".dylib", ".su"});
         }
     }
-
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NativeLibrary.java

@@ -44,7 +44,6 @@
 import java.util.logging.Level;
 
 import com.oracle.graal.python.PythonLanguage;
-import com.oracle.graal.python.builtins.modules.ImpModuleBuiltins;
 import com.oracle.graal.python.nodes.PNodeWithContext;
 import com.oracle.graal.python.runtime.NativeLibraryFactory.InvokeNativeFunctionNodeGen;
 import com.oracle.graal.python.runtime.exception.PythonControlFlowException;
@@ -241,7 +240,7 @@ private Object loadLibrary(PythonContext context) {
 
     public static String getLibPath(PythonContext context, String name) {
         CompilerAsserts.neverPartOfCompilation();
-        String libPythonName = name + ImpModuleBuiltins.ExtensionSuffixesNode.getSoAbi(context);
+        String libPythonName = name + context.getSoAbi();
         TruffleFile homePath = context.getEnv().getInternalTruffleFile(context.getCAPIHome());
         TruffleFile file = homePath.resolve(libPythonName);
         return file.getPath();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -58,8 +58,10 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Python3Core;
+import com.oracle.graal.python.builtins.modules.GraalPythonModuleBuiltins;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.graal.python.builtins.objects.PythonAbstractObjectFactory.PInteropGetAttributeNodeGen;
 import com.oracle.graal.python.builtins.objects.cext.PythonNativeClass;
 import com.oracle.graal.python.builtins.objects.cext.capi.CApiContext;
 import com.oracle.graal.python.builtins.objects.cext.capi.PThreadState;
@@ -90,6 +92,7 @@
 import com.oracle.graal.python.runtime.exception.PythonThreadKillException;
 import com.oracle.graal.python.runtime.object.IDUtils;
 import com.oracle.graal.python.util.Consumer;
+import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.graal.python.util.ShutdownHook;
 import com.oracle.graal.python.util.Supplier;
 import com.oracle.truffle.api.Assumption;
@@ -107,9 +110,11 @@
 import com.oracle.truffle.api.interop.ExceptionType;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.nodes.LanguageInfo;
 import com.oracle.truffle.api.profiles.ConditionProfile;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.utilities.CyclicAssumption;
+import com.oracle.truffle.llvm.api.Toolchain;
 
 public final class PythonContext {
     private static final Source IMPORT_WARNINGS_SOURCE = Source.newBuilder(PythonLanguage.ID, "import warnings\n", "<internal>").internal(true).build();
@@ -287,6 +292,8 @@ private static final class AtExitHook {
     @CompilationFinal private CApiContext cApiContext;
     @CompilationFinal private GraalHPyContext hPyContext;
 
+    private String soABI; // cache for soAPI
+
     private static final Assumption singleNativeContext = Truffle.getRuntime().createAssumption("single native context assumption");
 
     private final ReentrantLock globalInterpreterLock = new ReentrantLock();
@@ -1321,4 +1328,31 @@ public String getCodeFilename(CallTarget callTarget) {
     public long getDeserializationId(String fileName) {
         return deserializationId.computeIfAbsent(fileName, f -> new AtomicLong()).incrementAndGet();
     }
+
+    @TruffleBoundary
+    public String getSoAbi() {
+        if (soABI == null) {
+            PythonModule sysModule = getCore().lookupBuiltinModule("sys");
+            Object implementationObj = ReadAttributeFromObjectNode.getUncached().execute(sysModule, "implementation");
+            // sys.implementation.cache_tag
+            String cacheTag = (String) PInteropGetAttributeNodeGen.getUncached().execute(implementationObj, "cache_tag");
+            // sys.implementation._multiarch
+            String multiArch = (String) PInteropGetAttributeNodeGen.getUncached().execute(implementationObj, "_multiarch");
+
+            LanguageInfo llvmInfo = env.getInternalLanguages().get(GraalPythonModuleBuiltins.LLVM_LANGUAGE);
+            Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
+            String toolchainId = toolchain.getIdentifier();
+
+            // only use '.dylib' if we are on 'Darwin-native'
+            String soExt;
+            if ("darwin".equals(PythonUtils.getPythonOSName()) && "native".equals(toolchainId)) {
+                soExt = ".dylib";
+            } else {
+                soExt = ".so";
+            }
+
+            soABI = "." + cacheTag + "-" + toolchainId + "-" + multiArch + soExt;
+        }
+        return soABI;
+    }
 }