[GR-14768] Build a GraalVM directly with the right SVM options for testing Ruby.

PullRequest: truffleruby/757

Author: eregon

ci.jsonnet

@@ -252,7 +252,7 @@ local part_definitions = {
           self.svm_suite + ",truffleruby",
           "--disable-polyglot",
           "--disable-libpolyglot",
-          "--force-bash-launchers=lli,truffleruby",
+          "--force-bash-launchers=lli,native-image",
           "gate",
           "--no-warning-as-error",
           "--tags",
@@ -557,23 +557,37 @@ local composition_environment = utils.add_inclusion_tracking(part_definitions, "
       "ruby-test-cexts-darwin": darwin_gate + $.use.gem_test_pack + $.run.test_cexts,
     } +
 
-    local svm_test_platforms = {
-      local shared = $.jdk.labsjdk8 + $.use.common + $.use.svm + $.cap.gate + $.svm.gate,
-
-      linux: $.platform.linux + shared + { "$.svm.gate":: { tags: "build,ruby_debug,ruby_product" } },
-      darwin: $.platform.darwin + shared + { "$.svm.gate":: { tags: "build,darwin_ruby" } },
-    };
+    local svm_test_shared = $.jdk.labsjdk8 + $.use.common + $.use.svm + $.cap.gate + $.svm.gate;
     {
-      local shared = $.use.build + $.svm.core + { timelimit: "01:00:00" },
-      local tag_override = { "$.svm.gate":: { tags: "build,ruby" } },
+      local shared = $.use.build + $.svm.core + {
+        "$.svm.gate":: {
+          tags: "build,ruby"
+        },
+        environment+: {
+          EXTRA_IMAGE_BUILDER_ARGUMENTS: "-H:GreyToBlackObjectVisitorDiagnosticHistory=16", # GR-9912
+        },
+        timelimit: "01:00:00",
+      },
 
-      "ruby-test-svm-graal-core-linux": shared + svm_test_platforms.linux + tag_override,
-      "ruby-test-svm-graal-core-darwin": shared + svm_test_platforms.darwin + tag_override,
+      "ruby-test-svm-graal-core-linux": $.platform.linux + svm_test_shared + shared,
+      "ruby-test-svm-graal-core-darwin": $.platform.darwin + svm_test_shared + shared,
     } + {
       local shared = $.use.build + $.svm.enterprise + { timelimit: "01:15:00" },
 
-      "ruby-test-svm-graal-enterprise-linux": shared + svm_test_platforms.linux,
-      "ruby-test-svm-graal-enterprise-darwin": shared + svm_test_platforms.darwin,
+      "ruby-test-svm-graal-enterprise-linux": $.platform.linux + svm_test_shared + shared + {
+        "$.svm.gate":: {
+          tags: "build,ruby_product"
+        },
+        environment+: {
+          EXTRA_IMAGE_BUILDER_ARGUMENTS: "-H:+VerifyGraalGraphs -H:+VerifyPhases -H:+AOTPriorityInline -H:+VerifyDeoptimizationEntryPoints",
+        },
+      },
+      "ruby-test-svm-graal-enterprise-darwin": $.platform.darwin + svm_test_shared + shared + {
+        "$.svm.gate":: {
+          tags: "build,darwin_ruby"
+        },
+        # No extra verifications, this CI job is already slow
+      },
     },
 
   local other_rubies = {

mx.truffleruby/suite.py

@@ -9,7 +9,7 @@
                 "name": "tools",
                 "subdir": True,
                 # version must always be equal to the version of the "sulong" import below
-                "version": "982c4186d869613d1e4fd00040b5bad86338ce2a",
+                "version": "32e335f78fdf36097d832d5af2f17fb789d5e02a",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -19,7 +19,7 @@
                 "name": "sulong",
                 "subdir": True,
                 # version must always be equal to the version of the "tools" import above
-                "version": "982c4186d869613d1e4fd00040b5bad86338ce2a",
+                "version": "32e335f78fdf36097d832d5af2f17fb789d5e02a",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

tool/jt.rb

@@ -710,6 +710,7 @@ def run_ruby(*args)
       case arg
       when '--native'
         native = true
+        vm_args << '--native'
       when '--no-core-load-path'
         core_load_path = false
       when '--graal'
@@ -1311,6 +1312,7 @@ def test_specs(command, *args)
       if args.delete('--native')
         verify_native_bin!
         options << '-t' << find_launcher(true)
+        options << '-T--native'
       else
         options += %w[-T--vm.ea -T--vm.esa -T--vm.Xmx2G]
         options << "-T--core.load_path=#{TRUFFLERUBY_DIR}/src/main/ruby"
@@ -1747,7 +1749,7 @@ def benchmark(*args)
 
     run_args = []
 
-    if args.delete('--native') || (ENV.has_key?('JT_BENCHMARK_RUBY') && (ENV['JT_BENCHMARK_RUBY'] == find_launcher(true)))
+    if args.include?('--native') || (ENV.has_key?('JT_BENCHMARK_RUBY') && (ENV['JT_BENCHMARK_RUBY'] == find_launcher(true)))
       # We already have a mechanism for setting the Ruby to benchmark, but elsewhere we use AOT_BIN with the "--native" flag.
       # Favor JT_BENCHMARK_RUBY to AOT_BIN, but try both.
       benchmark_ruby ||= find_launcher(true)