Remove __testutil_save_binary_file built-in function.

Author: woess

wasm/mx.wasm/mx_wasm.py

@@ -135,7 +135,7 @@ def graal_wasm_gate_runner(args, tasks):
                 exitcode = mx_benchmark.benchmark([
                         "wasm:WASM_BENCHMARKCASES", "--",
                         "--jvm", "server", "--jvm-config", "graal-core",
-                        "-Dwasmbench.benchmarkName=" + b, "-Dwasmtest.keepTempFiles=true", "--",
+                        "-Dwasmbench.benchmarkName=" + b, "--",
                         "CMicroBenchmarkSuite", "-wi", "1", "-i", "1"])
                 if exitcode != 0:
                     mx.abort("Errors during benchmark tests, aborting.")

wasm/scripts/run-c-micro-benchmarks

@@ -16,7 +16,7 @@ do
     "--results-file=${RESULTS_FILE_PATH}" \
     wasm:WASM_BENCHMARKCASES -- \
     --jvm ${VM} --jvm-config ${VM_CONFIG} \
-    -Dwasmbench.benchmarkName=$benchmark -Dwasmtest.keepTempFiles=true -- \
+    -Dwasmbench.benchmarkName=$benchmark -- \
     CMicroBenchmarkSuite
 
   ${UPLOAD_CMD} "${RESULTS_FILE_PATH}"

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/emscripten/EmscriptenModule.java

@@ -44,13 +44,11 @@
 import static org.graalvm.wasm.WasmType.I32_TYPE;
 
 import org.graalvm.wasm.WasmContext;
-import org.graalvm.wasm.WasmInstance;
 import org.graalvm.wasm.WasmLanguage;
 import org.graalvm.wasm.WasmModule;
 import org.graalvm.wasm.WasmType;
 import org.graalvm.wasm.constants.GlobalModifier;
 import org.graalvm.wasm.predefined.BuiltinModule;
-import org.graalvm.wasm.predefined.testutil.TestutilModule;
 import org.graalvm.wasm.predefined.wasi.WasiFdWriteNode;
 
 public class EmscriptenModule extends BuiltinModule {
@@ -59,15 +57,6 @@ public class EmscriptenModule extends BuiltinModule {
     protected WasmModule createModule(WasmLanguage language, WasmContext context, String name) {
         final WasmModule module = WasmModule.createBuiltin(name);
 
-        final WasmInstance testutil = context.lookupModuleInstance("testutil");
-        if (testutil != null) {
-            // Emscripten only allows extern symbols through the 'env' module, so we need to
-            // re-export some symbols from the testutil module.
-            if (testutil.symbolTable().function(TestutilModule.Names.SAVE_BINARY_FILE) != null) {
-                importFunction(context, module, "testutil", TestutilModule.Names.SAVE_BINARY_FILE, types(I32_TYPE, I32_TYPE, I32_TYPE), types(), TestutilModule.Names.SAVE_BINARY_FILE);
-            }
-        }
-
         defineFunction(context, module, "abort", types(), types(), new AbortNode(language, module));
         defineFunction(context, module, "abortOnCannotGrowMemory", types(I32_TYPE), types(I32_TYPE), new AbortOnCannotGrowMemoryNode(language, module));
         defineFunction(context, module, "segfault", types(), types(), new SegfaultNode(language, module));

wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/predefined/testutil/SaveBinaryFileNode.java

@@ -40,56 +40,25 @@
  */
 package org.graalvm.wasm.predefined.testutil;
 
-import static org.graalvm.wasm.WasmType.I32_TYPE;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
 import org.graalvm.wasm.WasmContext;
 import org.graalvm.wasm.WasmLanguage;
 import org.graalvm.wasm.WasmModule;
 import org.graalvm.wasm.predefined.BuiltinModule;
 
 public class TestutilModule extends BuiltinModule {
 
-    public static class Options {
-        static final String KEEP_TEMP_FILES = System.getProperty("wasmtest.keepTempFiles", "false");
-    }
-
     public static class Names {
         public static final String RUN_CUSTOM_INITIALIZATION = "__testutil_run_custom_initialization";
-        public static final String SAVE_BINARY_FILE = "__testutil_save_binary_file";
-    }
-
-    private static Path createTemporaryDirectory() {
-        try {
-            if (Options.KEEP_TEMP_FILES.equals("true")) {
-                final Path directory = Paths.get("./test-output/");
-                directory.toFile().mkdirs();
-                return directory;
-            } else {
-                final Path tempDirectory = Files.createTempDirectory("temp-dir-");
-                tempDirectory.toFile().deleteOnExit();
-                return tempDirectory;
-            }
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @Override
     protected WasmModule createModule(WasmLanguage language, WasmContext context, String name) {
-        final Path temporaryDirectory = createTemporaryDirectory();
         WasmModule module = WasmModule.createBuiltin(name);
 
         // Note: in the following methods, the types are not important here, since these methods
         // are not accessed by Wasm code.
         defineFunction(context, module, Names.RUN_CUSTOM_INITIALIZATION, types(), types(), new RunCustomInitializationNode(language, module));
 
-        // The following methods are exposed to the Wasm test programs.
-        defineFunction(context, module, Names.SAVE_BINARY_FILE, types(I32_TYPE, I32_TYPE, I32_TYPE), types(), new SaveBinaryFileNode(language, module, temporaryDirectory));
         return module;
     }
 }