Support inline flags for Emscripten benchmarks, update Emscripten

Author: jirkamarsik

wasm/ci/ci_common/common.jsonnet

@@ -80,10 +80,10 @@ local graal_suite_root = root_ci.graal_suite_root;
 
   emsdk:: {
     downloads+: {
-      EMSDK_DIR: {name: 'emsdk', version: '1.39.13', platformspecific: true},
+      EMSDK_DIR: {name: 'emsdk', version: '4.0.10', platformspecific: true},
     },
     environment+: {
-      EMCC_DIR: '$EMSDK_DIR/emscripten/master/'
+      EMCC_DIR: '$EMSDK_DIR/upstream/emscripten/'
     }
   },
 
@@ -125,7 +125,7 @@ local graal_suite_root = root_ci.graal_suite_root;
     setup+: [
       ['set-export', 'ROOT_DIR', ['pwd']],
       ['set-export', 'EM_CONFIG', '$ROOT_DIR/.emscripten-config'],
-      ['mx', 'emscripten-init', '$EM_CONFIG', '$EMSDK_DIR']
+      ['mx', 'emscripten-init', '--detect', '$EM_CONFIG', '$EMSDK_DIR']
     ],
   },
 

wasm/docs/contributor/TestsAndBenchmarks.md

@@ -54,7 +54,7 @@ To compile these programs, you will need to install additional dependencies on y
 To build these additional tests and benchmarks, you need to:
 
 1. Install the [Emscripten SDK](https://emscripten.org/docs/getting_started/downloads.html).
-    We currently test against Emscripten **1.39.13**.
+    We currently test against Emscripten **4.0.10**.
     ```bash
     $ cd [preferred emsdk install location]
 
@@ -129,7 +129,7 @@ The benchmarks are kept in the `src/com.oracle.truffle.wasm.benchcases` MX proje
 For the benchmarks to run, `NODE_DIR` has to be set. You can use the node version that is part of Emscripten, for example:
 
 ```bash
-$ export NODE_DIR=[path to emsdk]/node/14.15.5_64bit/bin
+$ export NODE_DIR=[path to emsdk]/node/22.16.0_64bit/bin
 ```
 
 After building the additional benchmarks, as described in the last section, they can be executed as follows:

wasm/mx.wasm/mx_wasm.py

@@ -220,7 +220,6 @@ def processDeps(self, deps):
     "_benchmarkSetupEach",
     "_benchmarkTeardownEach",
     "_benchmarkRun",
-    "_main"
 ]
 
 
@@ -469,7 +468,7 @@ def build(self):
         include_flags = []
         if hasattr(self.project, "includeset"):
             include_flags = ["-I", os.path.join(_suite.dir, "includes", self.project.includeset)]
-        emcc_flags = ["-s", "EXIT_RUNTIME=1", "-s", "STANDALONE_WASM", "-s", "WASM_BIGINT"] + cc_flags
+        emcc_flags = ["-s", "STANDALONE_WASM", "-s", "WASM_BIGINT"] + cc_flags
         if self.project.isBenchmarkProject():
             emcc_flags = emcc_flags + ["-s", "EXPORTED_FUNCTIONS=" + str(self.benchmark_methods()).replace("'", "\"") + ""]
         subdir_program_names = defaultdict(lambda: [])
@@ -489,12 +488,23 @@ def build(self):
             timestampedOutput = mx.TimeStampFile(output_wasm_path)
             mustRebuild = timestampedSource.isNewerThan(timestampedOutput) or not timestampedOutput.exists()
 
+            source_cc_flags = []
+            native_bench = True
+            if filename.endswith(".c"):
+                with open(source_path) as f:
+                    source_file = f.read()
+                    for flags in re.findall(r'//\s*CFLAGS\s*=\s*(.*)\n', source_file):
+                        source_cc_flags.extend(flags.split())
+                    native_bench_option = re.search(r'//\s*NATIVE_BENCH\s*=\s*(.*)\n', source_file)
+                    if native_bench_option:
+                        native_bench = native_bench_option.group(1).lower() == "true"
+
             # Step 1: build the .wasm binary.
             if mustRebuild:
                 if filename.endswith(".c"):
                     # This generates both a js file and a wasm file.
                     # See https://github.com/emscripten-core/emscripten/wiki/WebAssembly-Standalone
-                    build_cmd_line = [emcc_cmd] + emcc_flags + [source_path, "-o", output_js_path] + include_flags
+                    build_cmd_line = [emcc_cmd] + emcc_flags + source_cc_flags + [source_path, "-o", output_js_path] + include_flags
                     if mx.run(build_cmd_line, nonZeroIsFatal=False) != 0:
                         mx.abort("Could not build the wasm-only output of " + filename + " with emcc.")
                 elif filename.endswith(".wat"):
@@ -533,11 +543,11 @@ def build(self):
 
             # Step 5: if this is a benchmark project, create native binaries too.
             if mustRebuild:
-                if filename.endswith(".c"):
+                if filename.endswith(".c") and native_bench:
                     mx_util.ensure_dir_exists(os.path.join(output_dir, subdir, NATIVE_BENCH_DIR))
                     output_path = os.path.join(output_dir, subdir, NATIVE_BENCH_DIR, mx.exe_suffix(basename))
                     link_flags = ["-lm"]
-                    gcc_cmd_line = [gcc_cmd] + cc_flags + [source_path, "-o", output_path] + include_flags + link_flags
+                    gcc_cmd_line = [gcc_cmd] + cc_flags + source_cc_flags + [source_path, "-o", output_path] + include_flags + link_flags
                     if mx.run(gcc_cmd_line, nonZeroIsFatal=False) != 0:
                         mx.abort("Could not build the native binary of " + filename + ".")
                     os.chmod(output_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR)
@@ -666,7 +676,7 @@ def find_executable(exe_name):
         llvm_root = os.path.join(emsdk_path, "upstream", "bin")
         binaryen_root = os.path.join(emsdk_path, "upstream", "lib")
         emscripten_root = os.path.join(emsdk_path, "upstream", "emscripten")
-        node_js = os.path.join(emsdk_path, "node", "14.15.5_64bit", "bin", "node")
+        node_js = os.path.join(emsdk_path, "node", "22.16.0_64bit", "bin", "node")
 
     mx.log("Generating Emscripten configuration...")
     mx.log("Config file path:    " + str(config_path))

wasm/mx.wasm/mx_wasm_benchmark.py

@@ -166,7 +166,7 @@ def run_vm(self, args, out=None, err=None, cwd=None, nonZeroIsFatal=False):
         try:
             tmp_dir = self.extract_jar_to_tempdir(jar, suite, benchmark)
             node_cmd = os.path.join(node_dir, "node")
-            node_cmd_line = [node_cmd, "--experimental-wasm-bigint", os.path.join(tmp_dir, "bench", suite, benchmark + ".js")]
+            node_cmd_line = [node_cmd, os.path.join(tmp_dir, "bench", suite, benchmark + ".js")]
             mx.log("Running benchmark " + benchmark + " with node.")
             mx.run(node_cmd_line, cwd=tmp_dir, out=out, err=err, nonZeroIsFatal=nonZeroIsFatal)
         finally: