[GR-58514] Open WasmLauncher for extension

PullRequest: graal/20324

Author: Felix Berlakovich

wasm/mx.wasm/mx_wasm.py

@@ -39,6 +39,7 @@
 # SOFTWARE.
 #
 import os
+import pathlib
 import re
 import shutil
 import stat
@@ -130,7 +131,7 @@ def wabt_test_args():
     if not wabt_dir:
         mx.warn("No WABT_DIR specified")
         return []
-    return ["-Dwasmtest.watToWasmExecutable=" + os.path.join(wabt_dir, mx.exe_suffix("wat2wasm"))]
+    return ["-Dwasmtest.watToWasmExecutable=" + os.path.join(wabt_dir, mx.exe_suffix("wat2wasm")), "-Dwasmtest.watToWasmVerbose=true"]
 
 
 def graal_wasm_gate_runner(args, tasks):
@@ -633,7 +634,10 @@ def emscripten_init(args):
     parser = ArgumentParser(prog='mx emscripten-init', description='initialize the Emscripten environment.')
     parser.add_argument('config_path', help='path of the config file to be generated')
     parser.add_argument('emsdk_path', help='path of the emsdk')
-    parser.add_argument('--local', action='store_true', help='Generates config file for local dev environment')
+
+    path_mode_group = parser.add_mutually_exclusive_group()
+    path_mode_group.add_argument('--detect', action='store_true', help='Try to detect the necessary directories in the emsdk automatically')
+    path_mode_group.add_argument('--local', action='store_true', help='Generates config file for local dev environment')
     args = parser.parse_args(args)
     config_path = os.path.join(os.getcwd(), args.config_path)
     emsdk_path = args.emsdk_path
@@ -643,6 +647,21 @@ def emscripten_init(args):
     emscripten_root = os.path.join(emsdk_path, "emscripten", "master")
     node_js = os.path.join(emsdk_path, "node", "12.9.1_64bit", "bin", "node")
 
+    def find_executable(exe_name):
+        for root, _, files in os.walk(args.emsdk_path):
+            if exe_name in files:
+                full_path = pathlib.Path(root, exe_name)
+                if os.access(full_path, os.X_OK):
+                    return full_path
+
+        mx.abort(f"Unable to find {exe_name} in {args.emsdk_path}")
+
+    if args.detect:
+        llvm_root = str(find_executable("llvm-ar").parent)
+        binaryen_root = str(find_executable("binaryen-lit").parent.parent)
+        emscripten_root = str(find_executable("emcc").parent)
+        node_js = str(find_executable("node"))
+
     if args.local:
         llvm_root = os.path.join(emsdk_path, "upstream", "bin")
         binaryen_root = os.path.join(emsdk_path, "upstream", "lib")

wasm/src/org.graalvm.wasm.launcher/src/org/graalvm/wasm/launcher/WasmLauncher.java

@@ -56,10 +56,10 @@
 import org.graalvm.polyglot.Value;
 
 public class WasmLauncher extends AbstractLanguageLauncher {
-    private File file = null;
+    protected File file = null;
     private VersionAction versionAction = VersionAction.None;
-    private String customEntryPoint = null;
-    private String[] programArguments = null;
+    protected String customEntryPoint = null;
+    protected String[] programArguments = null;
     private ArrayList<String> argumentErrors = null;
 
     private static final String USAGE = "Usage: wasm [OPTION...] [FILE] [ARG...]";
@@ -168,7 +168,7 @@ private int execute(Context.Builder contextBuilder) {
         }
     }
 
-    private Value detectEntryPoint(Value mainModule) {
+    protected Value detectEntryPoint(Value mainModule) {
         Value exports = mainModule.getMember("exports");
         if (customEntryPoint != null) {
             return exports.getMember(customEntryPoint);

wasm/src/org.graalvm.wasm.utils/src/org/graalvm/wasm/utils/SystemProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -48,6 +48,9 @@ public class SystemProperties {
     public static final String WAT_TO_WASM_EXECUTABLE_PROPERTY_NAME = "wasmtest.watToWasmExecutable";
     public static final String WAT_TO_WASM_EXECUTABLE = System.getProperty(WAT_TO_WASM_EXECUTABLE_PROPERTY_NAME);
 
+    public static final String WAT_TO_WASM_VERBOSE_PROPERTY_NAME = "wasmtest.watToWasmVerbose";
+    public static final Boolean WAT_TO_WASM_VERBOSE = Boolean.parseBoolean(System.getProperty(WAT_TO_WASM_VERBOSE_PROPERTY_NAME, "false"));
+
     public static final String BENCHMARK_NAME_PROPERTY_NAME = "wasmbench.benchmarkName";
     public static final String BENCHMARK_NAME = System.getProperty(BENCHMARK_NAME_PROPERTY_NAME);
 

wasm/src/org.graalvm.wasm.utils/src/org/graalvm/wasm/utils/WasmBinaryTools.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -40,6 +40,8 @@
  */
 package org.graalvm.wasm.utils;
 
+import static org.graalvm.wasm.utils.SystemProperties.WAT_TO_WASM_VERBOSE;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -188,7 +190,9 @@ private static String findWat2WasmExecutable() {
                             map(Path::of).map(p -> p.resolve(WAT_TO_WASM_EXECUTABLE_NAME)).filter(Files::isExecutable).findFirst();
             if (executableInPath.isPresent()) {
                 String pathAsString = executableInPath.get().toString();
-                System.err.println(String.format("Using %s from %s", WAT_TO_WASM_EXECUTABLE_NAME, pathAsString));
+                if (WAT_TO_WASM_VERBOSE) {
+                    System.err.println(String.format("Using %s from %s", WAT_TO_WASM_EXECUTABLE_NAME, pathAsString));
+                }
                 return pathAsString;
             }
         }
@@ -222,8 +226,10 @@ private static byte[] compileWatUncached(String name, String program, EnumSet<Wa
             try {
                 return wat2wasmFromString(program, options);
             } catch (RuntimeException e) {
-                System.err.println(e);
-                System.err.println("wat2wasm compilation via stdin+stdout failed, retrying with temporary files");
+                if (WAT_TO_WASM_VERBOSE) {
+                    System.err.println(e);
+                    System.err.println("wat2wasm compilation via stdin+stdout failed, retrying with temporary files");
+                }
                 compileUsingStdInOut = false;
             }
         }