[GR-17457] Filter host inlining to only include methods inside the or…

…g.truffleruby package PullRequest: truffleruby/4038
oracle · Nov 8, 2023 · 222e551 · 222e551
2 parents 9eaa9df + 78fa520
commit 222e551
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -214,6 +214,7 @@ local part_definitions = {
         "--extra-image-builder-argument=rubyvm:-H:+UnlockExperimentalVMOptions",
         "--extra-image-builder-argument=rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase",
         "--extra-image-builder-argument=rubyvm:-H:+TruffleHostInliningPrintExplored",
+        "--extra-image-builder-argument=rubyvm:-H:MethodFilter=org.truffleruby.*.*",
         "--extra-image-builder-argument=rubyvm:-H:-UnlockExperimentalVMOptions",
         "--extra-image-builder-argument=rubyvm:-Dgraal.LogFile=host-inlining.txt",
       ],

diff --git a/mx.truffleruby/native-ee-host-inlining b/mx.truffleruby/native-ee-host-inlining
@@ -2,7 +2,7 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/truffleruby-enterprise,/graal-enterprise,/vm-enterprise,/sulong-managed,/substratevm-enterprise,substratevm-enterprise-gcs
 COMPONENTS=TruffleRuby,suite:tools,GraalVM enterprise compiler,Truffle enterprise,GraalVM enterprise license files,LLVM Runtime Native Enterprise,SubstrateVM Enterprise,Truffle Macro Enterprise,suite:substratevm-enterprise-gcs
 NATIVE_IMAGES=lib:rubyvm
-EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Dgraal.LogFile=host-inlining.txt
+EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:MethodFilter=org.truffleruby.*.* rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Dgraal.LogFile=host-inlining.txt
 GENERATE_DEBUGINFO=false
 # To also create the standalone
 INSTALLABLES=TruffleRuby

diff --git a/mx.truffleruby/native-host-inlining b/mx.truffleruby/native-host-inlining
@@ -2,7 +2,7 @@ GRAALVM_SKIP_ARCHIVE=true
 DYNAMIC_IMPORTS=/tools,/compiler,/substratevm
 COMPONENTS=TruffleRuby,suite:tools,GraalVM compiler,SubstrateVM,Truffle Macro
 NATIVE_IMAGES=lib:rubyvm
-EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Dgraal.LogFile=host-inlining.txt
+EXTRA_IMAGE_BUILDER_ARGUMENTS=rubyvm:-H:+UnlockExperimentalVMOptions rubyvm:-H:BuildOutputJSONFile=native-image-build-rubyvm.json rubyvm:-H:Log=HostInliningPhase,~CanonicalizerPhase,~GraphBuilderPhase rubyvm:-H:+TruffleHostInliningPrintExplored rubyvm:-H:MethodFilter=org.truffleruby.*.* rubyvm:-H:-UnlockExperimentalVMOptions rubyvm:-Dgraal.LogFile=host-inlining.txt
 GENERATE_DEBUGINFO=false
 # To also create the standalone
 INSTALLABLES=TruffleRuby