[GR-68301] GraalWasm gates still use legacy GraalVM components.

PullRequest: graal/21725

Author: woess

wasm/mx.wasm/mx_wasm.py

@@ -84,7 +84,7 @@
 
 def get_jdk(forBuild=False):
     if not forBuild and mx.suite('compiler', fatalIfMissing=False):
-        return mx.get_jdk(tag='jvmci')
+        return mx.get_jdk(tag='graalvm')
     else:
         return mx.get_jdk()
 
@@ -125,24 +125,28 @@ def wabt_test_args():
 
 
 def graal_wasm_gate_runner(args, tasks):
+    unittest_args = []
+    if mx.suite('compiler', fatalIfMissing=False) is not None:
+        unittest_args = ["--use-graalvm"]
+
     with Task("BuildAll", tasks, tags=[GraalWasmDefaultTags.buildall]) as t:
         if t:
             mx.build(["--all"])
 
     with Task("UnitTests", tasks, tags=[GraalWasmDefaultTags.wasmtest], report=True) as t:
         if t:
-            unittest([*wabt_test_args(), "WasmTestSuite"], test_report_tags={'task': t.title})
-            unittest([*wabt_test_args(), "-Dwasmtest.sharedEngine=true", "WasmTestSuite"], test_report_tags={'task': t.title})
+            unittest(unittest_args + [*wabt_test_args(), "WasmTestSuite"], test_report_tags={'task': t.title})
+            unittest(unittest_args + [*wabt_test_args(), "-Dwasmtest.sharedEngine=true", "WasmTestSuite"], test_report_tags={'task': t.title})
 
     with Task("ExtraUnitTests", tasks, tags=[GraalWasmDefaultTags.wasmextratest], report=True) as t:
         if t:
-            unittest(["--suite", "wasm", "CSuite", "WatSuite"], test_report_tags={'task': t.title})
+            unittest(unittest_args + ["--suite", "wasm", "CSuite", "WatSuite"], test_report_tags={'task': t.title})
 
     with Task("CoverageTests", tasks, tags=[GraalWasmDefaultTags.coverage], report=True) as t:
         if t:
-            unittest([*wabt_test_args(), "-Dwasmtest.coverageMode=true", "WasmTestSuite"], test_report_tags={'task': t.title})
-            unittest([*wabt_test_args(), "-Dwasmtest.coverageMode=true", "-Dwasmtest.sharedEngine=true", "WasmTestSuite"], test_report_tags={'task': t.title})
-            unittest(["-Dwasmtest.coverageMode=true", "--suite", "wasm", "CSuite", "WatSuite"], test_report_tags={'task': t.title})
+            unittest(unittest_args + [*wabt_test_args(), "-Dwasmtest.coverageMode=true", "WasmTestSuite"], test_report_tags={'task': t.title})
+            unittest(unittest_args + [*wabt_test_args(), "-Dwasmtest.coverageMode=true", "-Dwasmtest.sharedEngine=true", "WasmTestSuite"], test_report_tags={'task': t.title})
+            unittest(unittest_args + ["-Dwasmtest.coverageMode=true", "--suite", "wasm", "CSuite", "WatSuite"], test_report_tags={'task': t.title})
 
     # This is a gate used to test that all the benchmarks return the correct results. It does not upload anything,
     # and does not run on a dedicated machine.
@@ -187,6 +191,12 @@ def apply(self, config):
         mainClassArgs += ['-JUnitOpenPackages', 'org.graalvm.wasm/*=com.oracle.truffle.wasm.debugtests']
         return (vmArgs, mainClass, mainClassArgs)
 
+    def processDeps(self, deps):
+        super().processDeps(deps)
+        truffle_runtime_dist_names = mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=True, use_enterprise=True)
+        mx.logv(f"Adding Truffle runtime distributions {', '.join(truffle_runtime_dist_names)} to unittest dependencies.")
+        deps.update((mx.distribution(d) for d in truffle_runtime_dist_names))
+
 
 mx_unittest.register_unittest_config(WasmUnittestConfig())
 
@@ -658,7 +668,7 @@ def wasm(args, **kwargs):
     mx_truffle.enable_sun_misc_unsafe(vmArgs)
 
     path_args = mx.get_runtime_jvm_args([
-        "TRUFFLE_API",
+        *mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=True, use_enterprise=True),
         "WASM",
         "WASM_LAUNCHER",
     ] + (['tools:CHROMEINSPECTOR', 'tools:TRUFFLE_PROFILER', 'tools:INSIGHT'] if mx.suite('tools', fatalIfMissing=False) is not None else []))

wasm/src/org.graalvm.wasm.test/src/org/graalvm/wasm/test/WasmFileSuite.java

@@ -116,10 +116,16 @@ public abstract class WasmFileSuite extends AbstractWasmSuite {
     private static final int INITIAL_STATE_CHECK_ITERATIONS = 10;
     private static final int STATE_CHECK_PERIODICITY = 2000;
 
-    private static Map<String, String> getInterpretedNoInline() {
+    private static boolean isFallbackRuntime() {
+        return Truffle.getRuntime().getName().equals("Interpreted");
+    }
+
+    private static Map<String, String> getInterpreted() {
+        if (isFallbackRuntime()) {
+            return Map.of();
+        }
         return Map.ofEntries(
-                        Map.entry("engine.Compilation", "false"),
-                        Map.entry("compiler.Inlining", "false"));
+                        Map.entry("engine.Compilation", "false"));
     }
 
     private static Map<String, String> getSyncCompiledNoInline() {
@@ -148,6 +154,9 @@ private static Map<String, String> getAsyncCompiled() {
     }
 
     private static Map<String, String> getAsyncCompiledShared() {
+        if (isFallbackRuntime()) {
+            return Map.of();
+        }
         return getAsyncCompiled();
     }
 
@@ -406,9 +415,13 @@ private void runInContexts(WasmCase testCase, Context.Builder contextBuilder, Ar
                 interpreterIterations = Math.min(interpreterIterations, 1);
             }
 
-            context = contextBuilder.options(getInterpretedNoInline()).option("wasm.EvalReturnsInstance", "true").build();
+            context = contextBuilder.options(getInterpreted()).option("wasm.EvalReturnsInstance", "true").build();
             runInContext(testCase, context, sources, interpreterIterations, PHASE_INTERPRETER_ICON, "interpreter", testOut);
 
+            if (isFallbackRuntime()) {
+                return;
+            }
+
             // Run in synchronous compiled mode, with inlining turned off.
             // We need to run the test at least twice like this, since the first run will lead to
             // de-opts due to empty profiles.