Use -H:BuildOutputJSONFile to get data from the native image builder

* Instead of parsing the output.

Author: eregon

ci.jsonnet

@@ -71,8 +71,7 @@ local part_definitions = {
 
     build: {
       setup+: [["mx", "sversions"]] +
-              # aot-build.log is used for the build-stats metrics, in other cases it does no harm
-              jt(["build", "--env", self.mx_env] + self.mx_options + ["--"] + self.mx_build_options + ["|", "tee", "aot-build.log"]) +
+              jt(["build", "--env", self.mx_env] + self.mx_options + ["--"] + self.mx_build_options) +
               [
                 # make sure jt always uses what was just built
                 ["set-export", "RUBY_BIN", jt(["--use", self.mx_env, "--silent", "launcher"])[0]],

mx.truffleruby/native

@@ -2,5 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,Native Image
 NATIVE_IMAGES=suite:sulong,lib:rubyvm
+EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json
 # To also create the standalone
 INSTALLABLES=TruffleRuby

mx.truffleruby/native-ee

@@ -2,6 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise
 NATIVE_IMAGES=suite:sulong,lib:rubyvm
-EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+AuxiliaryEngineCache rubyvm:-H:ReservedAuxiliaryImageBytes=1073741824
+EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:+AuxiliaryEngineCache rubyvm:-H:ReservedAuxiliaryImageBytes=1073741824
 # To also create the standalone
 INSTALLABLES=TruffleRuby

mx.truffleruby/native-ee-g1

@@ -2,6 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/graal-enterprise,/substratevm-enterprise,substratevm-enterprise-gcs
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,SubstrateVM Enterprise,SubstrateVM Enterprise GC
 NATIVE_IMAGES=suite:sulong,lib:rubyvm
-EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UseG1GC
+EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:+UseG1GC
 # To also create the standalone
 INSTALLABLES=TruffleRuby

mx.truffleruby/native-host-inlining

@@ -2,6 +2,6 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,Native Image
 NATIVE_IMAGES=lib:rubyvm
-EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-Dgraal.LogFile=host-inlining.txt
+EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-Dgraal.LogFile=host-inlining.txt
 # To also create the standalone
 INSTALLABLES=TruffleRuby

tool/jt.rb

@@ -1727,11 +1727,11 @@ def build_stats(attribute, *args)
 
     value = case attribute
             when 'binary-size'
-              build_stats_native_binary_size(*args)
+              build_stats_native_binary_size
             when 'build-time'
-              build_stats_native_build_time(*args)
+              build_stats_native_build_time
             when 'runtime-compilable-methods'
-              build_stats_native_runtime_compilable_methods(*args)
+              build_stats_native_runtime_compilable_methods
             else
               raise ArgumentError, attribute
             end
@@ -1743,25 +1743,21 @@ def build_stats(attribute, *args)
     end
   end
 
-  private def build_stats_native_binary_size(*args)
+  private def build_stats_native_binary_size
     truffleruby_native!
     File.size(language_lib_path) / 1024.0 / 1024.0
   end
 
-  private def build_stats_native_build_time(*args)
-    log = File.read('aot-build.log')
-    unless log =~ /\[librubyvm:\d+\] Finished generating 'librubyvm' in (\d+)m (\d+)s\./
-      raise 'Could not find line with build time for librubyvm'
-    end
-    Integer($1) * 60 + Integer($2)
+  private def build_stats_native_build_time
+    require 'json'
+    data = JSON.load(File.read('native-image-build-rubyvm.json'))
+    data.fetch('resource_usage').fetch('total_secs')
   end
 
-  private def build_stats_native_runtime_compilable_methods(*args)
-    log = File.read('aot-build.log')
-    unless log =~ /\[librubyvm:\d+\]\s*(?<method_count>[\d,]+)\s*runtime compiled methods/
-      raise 'Could not find line with runtime methods for librubyvm'
-    end
-    Integer($~[:method_count].gsub(',', ''))
+  private def build_stats_native_runtime_compilable_methods
+    require 'json'
+    data = JSON.load(File.read('native-image-build-rubyvm.json'))
+    data.fetch('image_details').fetch('runtime_compiled_methods').fetch('count')
   end
 
   def metrics(command, *args)