cache sources created during startup

Author: lukasstadler

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/PythonLanguage.java

@@ -30,12 +30,14 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
 
 import org.graalvm.options.OptionDescriptors;
 
 import com.oracle.graal.python.builtins.Python3Core;
 import com.oracle.graal.python.builtins.objects.PNone;
 import com.oracle.graal.python.builtins.objects.PythonAbstractObject;
+import com.oracle.graal.python.builtins.objects.code.PCode;
 import com.oracle.graal.python.builtins.objects.function.PArguments;
 import com.oracle.graal.python.builtins.objects.function.PBuiltinFunction;
 import com.oracle.graal.python.builtins.objects.function.PKeyword;
@@ -384,12 +386,22 @@ public static Source newSource(PythonContext ctxt, String src, String name) {
         }
     }
 
-    public static Source newSource(PythonContext ctxt, TruffleFile src, String name) throws IOException {
-        return newSource(ctxt, Source.newBuilder(ID, src), name);
+    private final ConcurrentHashMap<Object, Source> cachedSources = new ConcurrentHashMap<>();
+
+    public Source newSource(PythonContext ctxt, TruffleFile src, String name) throws IOException {
+        Source source = cachedSources.get(src);
+        if (source == null) {
+            cachedSources.put(src, source = newSource(ctxt, Source.newBuilder(ID, src), name));
+        }
+        return source;
     }
 
-    public static Source newSource(PythonContext ctxt, URL url, String name) throws IOException {
-        return newSource(ctxt, Source.newBuilder(ID, url), name);
+    public Source newSource(PythonContext ctxt, URL url, String name) throws IOException {
+        Source source = cachedSources.get(url);
+        if (source == null) {
+            cachedSources.put(url, source = newSource(ctxt, Source.newBuilder(ID, url), name));
+        }
+        return source;
     }
 
     private static Source newSource(PythonContext ctxt, SourceBuilder srcBuilder, String name) throws IOException {
@@ -411,4 +423,10 @@ protected void initializeMultipleContexts() {
         super.initializeMultipleContexts();
         singleContextAssumption.invalidate();
     }
+
+    private final ConcurrentHashMap<String, PCode> cachedCode = new ConcurrentHashMap<>();
+
+    public Object cacheCode(String filename, Supplier<PCode> createCode) {
+        return cachedCode.computeIfAbsent(filename, f -> createCode.get());
+    }
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -575,15 +575,15 @@ private Source getSource(String basename, String prefix) {
         if (url != null) {
             // This path is hit when we load the core library e.g. from a Jar file
             try {
-                return PythonLanguage.newSource(ctxt, new URL(url + suffix), basename);
+                return getLanguage().newSource(ctxt, new URL(url + suffix), basename);
             } catch (IOException e) {
                 throw new RuntimeException("Could not read core library from " + url);
             }
         } else {
             Env env = ctxt.getEnv();
             TruffleFile file = env.getTruffleFile(prefix + suffix);
             try {
-                return PythonLanguage.newSource(ctxt, file, basename);
+                return getLanguage().newSource(ctxt, file, basename);
             } catch (SecurityException | IOException t) {
                 throw new RuntimeException("Could not read core library from " + file);
             }

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

@@ -612,7 +612,12 @@ Object compile(String expression, String filename, String mode, Object kwFlags,
             } else {
                 throw raise(ValueError, "compile() mode must be 'exec', 'eval' or 'single'");
             }
-            return factory().createCode((RootNode) getCore().getParser().parse(pm, getCore(), source, null));
+            Supplier<PCode> createCode = () -> factory().createCode((RootNode) getCore().getParser().parse(pm, getCore(), source, null));
+            if (getCore().isInitialized()) {
+                return createCode.get();
+            } else {
+                return getCore().getLanguage().cacheCode(filename, createCode);
+            }
         }
 
         @SuppressWarnings("unused")

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

@@ -50,7 +50,6 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
-import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Builtin;
 import com.oracle.graal.python.builtins.CoreFunctions;
 import com.oracle.graal.python.builtins.PythonBuiltins;
@@ -375,7 +374,7 @@ public Object run(String path, PythonModule mod) {
                 } else {
                     file = env.getTruffleFile(path);
                 }
-                Source src = PythonLanguage.newSource(ctxt, file, fileName);
+                Source src = getCore().getLanguage().newSource(ctxt, file, fileName);
                 CallTarget callTarget = env.parse(src);
                 callTarget.call(PArguments.withGlobals(mod));
             } catch (PException e) {