Adding support for tracking time needed for method layouting.

graalvm · Jul 21, 2022 · cc92627 · cc92627
1 parent d8298e6
commit cc92627
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/...evm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/TimerCollection.java b/...evm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/util/TimerCollection.java
@@ -56,6 +56,7 @@ public enum Registry {
         PARSE("(parse)"),
         INLINE("(inline)"),
         COMPILE("(compile)"),
+        LAYOUT("(layout)"),
         DEBUG_INFO("dbginfo"),
         IMAGE("image"),
         WRITE("write");

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGenerator.java
@@ -648,10 +648,12 @@ private void doRun(Map<Method, CEntryPointData> entryPoints,
                 /* release memory taken by graphs for the image writing */
                 hUniverse.getMethods().forEach(HostedMethod::clear);
 
-                codeCache = NativeImageCodeCacheFactory.get().newCodeCache(compileQueue, heap, loader.platform,
-                                ImageSingletons.lookup(TemporaryBuildDirectoryProvider.class).getTemporaryBuildDirectory());
-                codeCache.layoutConstants();
-                codeCache.layoutMethods(debug, bb, compilationExecutor);
+                try (ProgressReporter.ReporterClosable ac = reporter.printLayout()) {
+                    codeCache = NativeImageCodeCacheFactory.get().newCodeCache(compileQueue, heap, loader.platform,
+                                    ImageSingletons.lookup(TemporaryBuildDirectoryProvider.class).getTemporaryBuildDirectory());
+                    codeCache.layoutConstants();
+                    codeCache.layoutMethods(debug, bb, compilationExecutor);
+                }
 
                 BuildPhaseProvider.markCompilationFinished();
                 AfterCompilationAccessImpl config = new AfterCompilationAccessImpl(featureHandler, loader, aUniverse, hUniverse, compileQueue.getCompilations(), codeCache, heap, debug, runtime);

diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/ProgressReporter.java
@@ -139,6 +139,7 @@ private enum BuildStage {
         PARSING("Parsing methods", true, true),
         INLINING("Inlining methods", true, false),
         COMPILING("Compiling methods", true, true),
+        LAYOUTING("Layouting methods", true, true),
         CREATING("Creating image");
 
         private static final int NUM_STAGES = values().length;
@@ -428,6 +429,19 @@ public void closeAction() {
         };
     }
 
+    public ReporterClosable printLayout() {
+        Timer timer = getTimer(TimerCollection.Registry.LAYOUT);
+        timer.start();
+        stagePrinter.start(BuildStage.LAYOUTING);
+        return new ReporterClosable() {
+            @Override
+            public void closeAction() {
+                timer.stop();
+                stagePrinter.end(timer);
+            }
+        };
+    }
+
     // TODO: merge printCreationStart and printCreationEnd at some point (GR-35721).
     public void printCreationStart() {
         stagePrinter.start(BuildStage.CREATING);